another go at types
Merge branch 'master' of github.com:pigworker/Frank