Beta Architecture

Work in progress