Architecture

Issue 11