Changes to story, still debugging cascading database save...
Merge