Probably don't need all this commented out code?