Start on regexes (not tested)
Cleaner first pass, not working yet
Checkpoint
Merge branch 'clean'
updated .gitignore
fixed regexes and class syntax