Eng6884 review

Don't merge...I'm going to squash the commits down to something sane after review.
If there are a lot of these, would it make sense to initialize these lists lazily? Could leverage accessors to make this seamless? 

Discussing with you F2F right now about how many of these there are.