First draft for the unit range services #21