Refactored

Redid a lot of shit