Removed stupid classes and started working on persistent objects