bring his extension up to date

The code in his extension (brought over from the hybrid) is very old.
updated to use new naming conventions and new data formats.