Getting tests and consumer up to date
rewriting and breaking up parsing/processing functions
progress on parsing/processing functions