Refactor to latest almost-functional
Merge branch 'master' of github.com:nwillc/scotty