Feature/book 673 STILL WIP