update encounter

converting into a class system