More work done on parsing.  Regexes... yay