I'm comfortable editing files. Although I'd be pleased if you posted an unmerged version, I appreciate the present work.