Do we want all this commented out code?