Add Wall class, some overall fixes