Heavy, Heavy refactor - with all the changes needed to have consistent Tour/MW