BIG changes - working, pagination, no search, no adding