Entire transaction flow works, still very badly structured.