Some work with new platforms
Merge remote-tracking branch 'origin/master'
I think this will do it for 50%