Not as much luck with that one, so reverted. Still some bugs, needs more tests