new-architecture commit

preliminary "new-architecture" commit