Removing manual unit conversions if favor of a unit library.  (should expand scope of the project nicely.
Moving Citrus load out of the class to prevent multiple load events.