FIXED MOVES! - need to clean the code now