Added data parsing/munging.