[WIP-02] Add GetACHReturns functions. Some code cleanup