Rough update to haxe3