-first pass new version working wrt parsing etc