More work on timesheet