REARRANGE PERSISTENCE!

SO MUCH CLEANING.
Also, network play is broken :(