Might as well commit everything I've done so far.