Add pagination. refs #10