Added TODO
Implemented Contains