Added 3 controllers, modified persistence layer