nearly there
final commit, I hope
Merge branch 'master' of https://github.com/opsystems/pi