Lots of structure changes. Still working on rebuilding.