major refactor. Architecture simplified