updates, but not working yet
updated combat, and it sort of works.  Not sure about multiple people joining combat yet, though.