Add a done method so it can be extended

Merge:	!ix