First commit; with paginator and paginator tests
fixed conflicts