Commenting out validation, causing bugs/issues