Revisions to tour class and migrated file based methods to use internal
storage.