More work on the boxes
Merge branch 'master' of github.com:shammancer/identities