Too difficult to merge the branch so I've pulled in various files by hand.