AddHandler added, start of user based refactor