almost done ripping out extraneous layers, only to add more complicated ones