corrected some tests, added a demo
added some more drafts for interfaces need for this project