refactored challenge one and prepared for challenge two