almost done intSingleValue
merged conflicts