Feature/graviton event

code duplication; found this in lines 145ff and 61ff  already » extract to priv method?