move most of the junk into gist