Things i forgot to commit (IDR what's in them)
Repo debug issues

I went through some of the code for like 2 hours trying to fix merging
issues
Hopefully everything is intact