Layer fixup

Starting to sort out the layers of existing objects and panicking about
how awful everything is.