Incremental changes to get saving and loading working