Chaining, example update and tests

All tests passing