Added new architecture, unfinished

States still need to be specified