Test for garbage
Break up the parser a little better