reposition map, add state table, etc
merge