Nicer output..
Parser still funky ;-)