Trying to fix Transfer issue. Halfway through.