Added Enumbs and Wall class