use proper namespacing, main validator no longer a lambda