Begin adding caps.
Merge branch 'master' of github.com:kostja/world
Merge branch 'master' of github.com:kostja/world
A few more tweaks with fanout and data layout