Working through Chapter 2 issues

When removing todo items I either fix them or at least add them as issues in GitHub.