refactored code, broke rematch, need to push