refactoring so objects are stored in an object
continuing on