Replace a bunch of crap code with simple working version
Add demo files