Wip overall rework
Wip spying
Fixed paginator issue