Uncommented Oskars code in canMoveBlock
Fixed merge