Persistence basically working. Removed some unnecessary commented code.