Mostly working.  Need to account for 'and'