This was a pretty complicated issue and Jesus did a good job talking through it with me and verifying everything is now working as intended, Thanks!
