* More work on tech demo