Re-do pagination system...makes much more sense now.