Preliminary db change up.  Need to test.
Pagination done, tweaks done