Added basic pagination but commented out for now