Dealing with some unfinished business.

Adam Tinworth @adders