TODO: fix calendar 5 hour inconsistency

currently we are hard coding a 5 hour increase to the timestamps selected on the calendar. need to investigate why it isn't working properly