lots of cleanup and floorplans first attempt