Interm commit.
Refactored to use new library interface.