Re-organised the example and moved things around a little.