
        Implement proper calc parsing

2bb6b45