Work in progress commit - started the groundwork on the time reporting