more progress
Merge branch 'master' of github.com:dannydavidson/pitch
reorged