Save it while its not too broken, haha
Refactor