Final commit v2

cleaned up the transfer code