Some work on completePurchase here

Since you are looking now & I'm a bit focussed elsewhere this week I thought I'd make sure all my code was at least PR'd up to where I am at