Work on updating movement code in new location