Before pull
Conflict solved
Moving up added, MoveTask and GameSurface now is class
Working in Design