Added persistance, adding date, need to set up constraints better, working most part