Tons of work by biscuitehh and kortaggio.
Sharing details, https fixes
Fixing conflict