Add contains and duplicate checking
Added remove functionality, missing tests