Made various changes for testing + fixing intersection bug.  TODO: account for intersections w/ walls.