Fixed that shit!

Rewrote A LOT