Added more items to (eventually) do
Moved sender and receiver to a separate configuration file