Add pagination - closes #5