Fix whitespace
Move UnitObject base cases to the library function
Add unit support for vExtend