Added other tables, and broke up a couple