Reworked Demos

Demos are complete