Worst commit ever. Didn't quite version control this redesign..heh