Continued work on timepicker