Add TODO
Add migration to ensure that current data is okay with new validation
scheme.
Update to respect new validations