Committing working prototype and demo