playing around with ideas
Merge pull request #3198 from mgchris/master

playing around with ideas