Develop

Removed battools submodule. Fixed some bugs. Cleaned up some saving/loading stuff. Adjusted tests.