All the story bits enfileized

Though I realized that two of my functions should really be one
function. Once I collapse them, the need for a helper function in the
story module will disappear.