Add PitchWall, and some States