Slight reorganization, added time object