Diff for code review

Comment early, comment often!