Working on remove, other methods appear to be working.  Need to eliminate unnecessary looping