Persistence Working

Only a couple of bugs if anything