Added pagination. Working at a 100%