Adds refund and resolves #2