WIP on client side of demo