Initial architecture commit