Broke up parsing into own class.  more tests and more validation prior to calling