Added remove. Not tested yet!!!