7.x 1.x Pull Request Attempt 3

This should be the correct direction