Does this need a little more attention? Not sure why we would be including commented out code in a new class is all.