Refactoring; add basic pagination functionality