Finished timecard + refactoring of some interfaces