Now without the automerge stuff...