This fixes broken stuff
Time to make things a little more organized!