Move some stuff to demo branch.