More work on metadata.

Still haven't got them into 1 block ID, but now they all use one class.