persistence and maybe something else
Merge pull request #256 from ThePyrotechnic/Dev

persistence and maybe something else