Start work on Deluge and Services modules