attempting to debug updatemove
fixed conflicts
fixed conflicts
final deliverable