Outputting revision

Moving things around so that outputting makes more sense. In-progress.