Some more regioning

Made the code a little cleaner with regions but may get a bit annoying.
I don't mind it honestly.