songs2 demo converted to parser class
tweak