Continuing with porting stuff to book format