More work on Sender source file.