More quest refactoring; progress now saved