refactoring of resolveEvents to prepare for turn resolution code