Add block collision

Fixes #2