Updated

Signed-off-by: Brandyn A. White <bwhite@dappervision.com>
Cleaned up to use new library

Signed-off-by: Brandyn A. White <bwhite@dappervision.com>