Essentially that's the plan, the real problem is that I did not code things with loading state in mind, so I would have to revisit everything for saving to work.
