cleanup
some stubbing. still need to make architectural choices