Mostly works, although there are still harmonics
Remove old code
Merge branch 'master' of github.com:hftf/terpsichore