Transition to new architecture (WIP)

Errors in validators