should be ready for V0.1 demo, please merge

Pretty please?