Pagination added, partial features implemented