more architecture improvements. validation works.