A little more cleanup, I've also started to consider why I even need the TripVars class anymore.  I'm not so sure that I do.  I could easily use the information already contained in the SQLite database.