cleaned up code
Minor tweaks
working
working demo