Added support for loading. Still needs more testing
Extremely minor changes, fixing nothing, commenting out lots of things