Feature/graviton event

and further adds validation to the method call