Not really working yet, but outline in place
Working datepicker
Merge branch 'datepicker' into develop