Calder/GS battle still playing out