added some more stubs and drafts