Started back-end rewrite to support pagination