Started rewriting Wall Class