Worked on dates
Further work on dates etc
Completed version