Architecture

@linusrogge