Added todo items for move mode to enable history support