Added some preliminary time management