work on pagination and pages.
fix conflicts.