Started to add some code to test movement resolution.