Fixing some odditites
Changed how data is pulled back. Poor man's paging