Interim save

Cleaned up narrative portions and code more.