Saving to repo, making some good progress here!