Started working on database implementation