added pagination
adds some eager loading