Random crap lol
Fixing merge conflicts... again...