Add ranges and sets as values
Started logic