Move Tables Around

Will do the rest in a local file and we can manually merge later