Move2 movement solver.

Pushing in current form so I don't lose it (too much debugging...)