Moved regex check into controller for now