Andrew, I've taken another stab at determining return code here.