Add in proper parsing for numbers and strings.