working
Adding tests, hitting snag
Merge branch 'master' into strange_fix