More work on Blocks
Merge branch 'master' of github.com:mathijsb/afp-ants