Update. Hopefully, I got it all right now. If not I'll give it another run