Some more quick hacking to support using multiple chapters. Not CRUD complete yet.