initial timer funcationality
added datepicker
1 million merge conflicts