Why is all of this commented?  Need to remove if we aren't using this code