if we agree on this I'll start adding some unit-tests for it. we can probably have a sitdown and discuss it tomorrow.