Working on the prototype and demo

It somewhat works now... kind of...