Uhhh, redo some work, didn't realize it was already here

(haven't looked at the one that exists yet, it's probably bettah :P)