New diagram, tests (BagOfSeven) and some code