Consolidated only

Progress PR, do not merge yet.

The changes are complete but require review.

Unit tests need to be updated to match new functions.
I guess not. Perhaps remove the _consolidated flag and add a "_compound" flag for the metrics which use the compound format? Would allow any consumers to just look at the most significant 4 bytes for display purposes (machiavelli, etc.)