Add shape_data
Merge branch '4blocks' into 3blocks
Merge branch '3blocks'