all done.
Commit before cleanup
Commit before breaking down core data methods
cleanup