First pass at fixing transfer