Existing validation is very hastly written. This should be replaced with something modern and better.