Parsing and singmaster notation has now been added