New choices to the wall section

Please review this, @casey-collab