Poked at my bad wall-detecting code. Decided to wait for Emily to push her code to progress further.
Fixed merge issues
Not sure if I changed anything.