Huge updates to the block system