Moved walls to own controller