Complete refactor of the Ember layer - set up for paging