Added a --onto option, but it's so complicated I can't tell if it works.