Need to fix final moves - otherwise functional