Basic pagination and adding non-paying customers
Merge conflicts