Feature/graviton event

code duplication; found this in line 61ff  already » extract to priv method?