Added unit support, working on getting conversions happening