Changes to block handling

Added some setup. Now to test it.