New addTables() and addWhere() functions.  Format clean up.