Remove query and put an arg for starting.