Refactor login
Time Entry additions