WORDS-59

New architecture is ready