some more fleshing out. pushing for demo