So.. I've got the latest Marlin 1.1.6 firmware all working :-)
Couldn't have done it without Samuel Pinches original work. I moved everything over but had to change the endstop pins and alter a couple of other things but it's fully working now :-)
Just doing some final tweaking then I'll release to all..