Completely rewrote the whole damn thing :P