Adds TODOs
Fixes bug where NSUserDefaults does not retain passenger data