Fixed it, here's the stuff!