new tables and mapping them the old way