Code Review

This commit is slightly ahead of our first version tag, but is stable and we will be presenting this version.