Cleaned up redundant calls, re-routed to single function that prototypes from TimeMap class