Table refactor: different methods. X and Y inverted. Clean up. In progress