got the parsing done right maybe?