More work on the conversion to BlockState