I broke more things, and this is the only way I know to undo them.
Merge https://github.com/jmichaluk/books_and_on