Small changes, got a subset of the books_tutorial example working.