finish the move to just tables, add ARNs, start with table states