trying to add some units stuff but @dweisz should probably step in