WIP
Merged from default
merge
Initial work on ranges
Merging from default