WIP branch that adds new features from github-book