Finish off implementing DFID rules from spreadsheet