Architecture

points 4.1 and 4.2 Incomplete