Continuing work on the gist clone