
        Implement proper calc parsing

360c279