Few small design changes and added all db changes to prepare for days model