Eng6884 review

Don't merge...I'm going to squash the commits down to something sane after review.
You mean an inner class?  No particular reason, it's just where I started typing and it didn't get large or cumbersome enough to motivate me to move it.