Update move constraints

Rough outline of move constraints