Ok, I *think* this finishes the merger with Ramin's draft