Added contains, some clean up work.