wip - tweeking out demo