Did another bunch of uncommented code.