updating to more dynamic pagination
pushing incomplete changes