We did some more work on this. Bear in mind that this is, while pushed to development branch, is not finished completely yet.
We still need to think about some of your stuff and
unit tests need to be worked at as well, basing them most likely on your
data from this post.
=> stay tuned but don't hold your breath
