Epic refactor of all chapters to close stage 1 of pending changes