[PR] Review Branch

I'm going to make some commits on the review branch as part of a code review. More than likely we'll end up with some that should be added through another branch or shouldn't be added at all.

This should give us the ability to comment on the individual commits for discussion though.