Made Time not be a static object