commented out infinite scrolling. Going to merge this branch to master