Committed code for Non-Linear Book version 2.0 pre-alpha