A bunch of new changes plus a new working example.