adding jordan's stuff
fix formatting
Merge pull request #13 from lutaylor/7.x

adding jordans stuff