working, albeit slow
Merge branch 'master' into slow-working