Rename storage to contained
Add relational operators
Add initial tests (C++11, lambda based)