Correction - Take and not Skip needed to be refactored for paging