going to get rid of Token objects
added lots of regexs, got rid of some classes.