Working on the chapter and experimental branch