basic architecure building blocks
removed old stuff