Feature/book 719 don't merge yet WIP