Commenting things for now. We need to clean up the code.