Revert "remove old stuff, add tests, add traceit"

This reverts commit 811dffdc4e73e41b7bcab7f6f0253b48e6a80f5b.
add 2i pagination capability