Auto-wall code done

Will likely break out the replacing and trimming, but for now, this is
ok.