Changed data definitions
This will allow blocks to not need a rigid header. And allow things to be more flexable.