2 dz Added ORM and fixed bugs