Does all this commented-out stuff need to be here?