Make add work with something that is already in

As per summary see the commits, it should explain itself.