Added some new instructions, new tests, different container class.