added all tables, but not added fields to match yet