Added victory detection and updated highlight system (TODO comments)