Started working on templates / updated database models