Fixing this branch

Trying to fix my branch. Save and loading added, for now.