WIP timesheet refactoring