Eng6884 review

Don't merge...I'm going to squash the commits down to something sane after review.
Hmm, I swear I tried SortedMap<> and got shot down by eclipse.  Let me try that instead, too