Revert to usual objects w/o the two layers, way too slick and hard to reason about. Need to see how defaults would be implemented.