added some more stubs and drafts
test commit
debug & test