Changed the timing system

Makes it much easier to test with no testing.