refactor ... currently missing fight logic