massive commit; including code used to wall follow