Added support for extra table and toggle between the two.

Cosner added a Pit data table to the database. This accounts for that
and does some extra cleaning up on the side.