JakeSteam Merge branch 'feature/saving_improvements' into develop