Why are we commenting all this stuff out? We should uncomment this or remove it.