Begun working on new pagination solution