Start the refactor to handle moving tags