#36 adding pager and tests