Changed MoveHandler to use Collections rather than Sets.