some redesign, commandline version looks promising
allmost forgot to add this to da committa