Add limiting to number of points returned

Limiting doesn't currently work, but this code should work well for when
we get that working