started persistance, and moved/deleted some things