Integrate new state builder into to rest of the app
Started supporting state validators