Architecture

@joelcolombo