range units are a go
refactor