Work in progress commit - more work on time reporting algorithm