fork, upgraded some dependencies, started to add some new stuff .. not finished