Show storage usage

Requires a lot of tidying up!
Merge branch 'master' of http://github.com/jrmhaig/Bakery