Added round class, refactored some match code