Adds Todo for @georgehrke in the timezone controller and other changes.