Refactor a bunch of logic, walls