Add in reworked timezone functionality