adding subscription and registration capability... still a mess