Before datepicker

encompasses #210 but without the datepicker work on the branch. datepicker implemented here.