Filling in some of the missing bits