Eng6884 review

Don't merge...I'm going to squash the commits down to something sane after review.