completed most of demo flow