Start adding some support for math notation