Continued rewrite. SimpleProperty works correctly, RangeProperty needs to be corrected.