Added time keeping framework, unfinished