Missed a few files
Pagination implemented