commiting trunk and working on it to update timekeeping