Yeah, pagination will probably come in a separate PR.