added beacon event code
added client beacon class
merge?