Redid it...It be broken now
Redoing stuff...
Fixed & removed a lot, too much for one commit