Refactor demo; add duo; update dependencies