JOI and EDGING with GRANDPA