Adding variable for calculateMovement-switch

Switch (between given defines CALCULATE_XXX) not implemented so far.
Progress on moveUp phase