more architecture and stubbing, things are coming along