Added the validator back in
Added some documentation about escaping