Adds current timer calculation

Tests are commented out, still working on this. Seems to be going fine but I can't be sure.