Eng6884 review

Don't merge...I'm going to squash the commits down to something sane after review.
What's the Integer for? It doesn't seem to be used. Should there be a comment?