Initial work on modifying the prompt regex and functions.