Added some work on units