Starting to flesh out the parsing rules