first pass at removing pagination