I can do both, though if you can take care of rebasing, it's cool :)