latest update, removed time controller, added a time factory