Improved regex. Allow punctuation and other characters in attributes
restore test plugin
Update Lexicon interface
do foreach here for now