Took out the class and did a little work on parsing strings.