Final commit

With the asserts from the test example.