All code is working on m7, about to test on other data sets
Made extract_walls look better