More progress with the example package
merge conflicts