cleanup
Added a separate interface and pagination classes. More refactoring to go.