Code Review

Comparing the first commit to master.