Tidied up methods and setup a event cookie to resolve #75