Replaced my move logic with dave's old move logic-- 3 tests now fail