small changes, still need delete function to work