Working on adding time tracking

Initial code written, need to test and validate.