Commenting out stuff I think doesn't apply