Started scoping.  Implemented scope for NumberValue's unit reference.