Holy sHIT!

Committing all of this before it gets out of hand...

All of this is HOT CODE! DO NOT MODIFY (no m_ pls)!! GitHub merges are
the worst and kill me every time :(
Merge with previous

idk how this is meant to work but there you go
please just stop github