Added johns stuff
Merge remote-tracking branch 'origin/johns_feature-branch'