Add the rest of the bumper patch.

I missed some files with the last bumper commit by mistake.  This commit
contains the rest of the bumper model code