Committing old work - changes to transfer threads/sockets?