Merge UnitVariable models

Added from different branches, merged functionality.