Beginnings of component demo
Simplified component demo, added one case.
oops.
Seems to work.
Fixes.