Refactors. Plz dun break.