Code review

Lets have a discussion in this pull request to help you out!  The main view you'll want to take a look at is Files Changed.