#66 begin work on allowing for both range types