messy commit mid-way through dev so as not to lose any work
Merge branch 'master' of github.com:lightenna/structuredfun-core