Code Review

Hi all,
I reset back to an early commit to compare this against your main branch. Do not approve this pull request.
It is merely to review your code.