This is kind of working, still needs to get put into PAT and lots of testing

[#75135164]