A few changes to the foundational classes and implementation of Time Me