almost there
Merge branch 'master' of https://github.com/DustyBones/SOPE

new stuff