Add Persistable stuff
Format all the things