BOOK-415 more work on getting org saving with the new project