refactor and walls. yay walls