Some more work. Portal validation needs to be improved.