Got the demo working, need to library-ify it now