Began adding pagination and interface modifications