Refactor to make Story a data-type/object