0.99.099 Cleanup, Table work

Timer tweaked back in after the refactors