Added Narratives and trying to fix up things