More Trapdoor cleanup.

Added foundation for pagination/limits
Started Traps handler