[WIP] Tweak so can use non integer range elements