diff --git a/data/aut-num/AS4242420017 b/data/aut-num/AS4242420017
index 8262eab0c..0cf706699 100644
--- a/data/aut-num/AS4242420017
+++ b/data/aut-num/AS4242420017
@@ -1,8 +1,5 @@
 aut-num:            AS4242420017
-as-name:            Quick-Quagga
-descr:              http://bind.tk/Jonathan-Ferguson/Quick-Quagga
-remarks:            wget http://bind.tk/Jonathan-Ferguson/Quick-Quagga && chmod u+x ./Quick-Quagga && ./Quick-Quagga
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
+as-name:            FERGUSON-DN42
 mnt-by:             JONATHAN-FERGUSON-MNT
 source:             DN42
diff --git a/data/inet6num/fd01:38f7:e6d8:4e04::_64 b/data/inet6num/fd01:38f7:e6d8:4e04::_64
index fd2e6feae..343f61bde 100644
--- a/data/inet6num/fd01:38f7:e6d8:4e04::_64
+++ b/data/inet6num/fd01:38f7:e6d8:4e04::_64
@@ -1,11 +1,10 @@
 inet6num:           fd01:38f7:e6d8:4e04:0000:0000:0000:0000 - fd01:38f7:e6d8:4e04:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd01:38f7:e6d8:4e04::/64
-descr:              Matryoshka eth0
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka eth0
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd01:38f7:e6d8:4e04::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd1d:62fd:3f4c:a247::_64 b/data/inet6num/fd1d:62fd:3f4c:a247::_64
index 2a2a394e4..ab4b2164e 100644
--- a/data/inet6num/fd1d:62fd:3f4c:a247::_64
+++ b/data/inet6num/fd1d:62fd:3f4c:a247::_64
@@ -1,11 +1,10 @@
 inet6num:           fd1d:62fd:3f4c:a247:0000:0000:0000:0000 - fd1d:62fd:3f4c:a247:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd1d:62fd:3f4c:a247::/64
-descr:              Matryoshka wlan4
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka wlan4
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd1d:62fd:3f4c:a247::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd32:54d6:1962:ad35::_64 b/data/inet6num/fd32:54d6:1962:ad35::_64
index 7c41a4143..ea9b2f8e9 100644
--- a/data/inet6num/fd32:54d6:1962:ad35::_64
+++ b/data/inet6num/fd32:54d6:1962:ad35::_64
@@ -1,11 +1,10 @@
 inet6num:           fd32:54d6:1962:ad35:0000:0000:0000:0000 - fd32:54d6:1962:ad35:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd32:54d6:1962:ad35::/64
-descr:              Raspberry Pi wlan1
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Raspberry Pi wlan1
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd32:54d6:1962:ad35::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd42:4242:17::_48 b/data/inet6num/fd42:4242:17::_48
index d9d311fa2..c1793495a 100644
--- a/data/inet6num/fd42:4242:17::_48
+++ b/data/inet6num/fd42:4242:17::_48
@@ -1,12 +1,10 @@
 inet6num:           fd42:4242:0017:0000:0000:0000:0000:0000 - fd42:4242:0017:ffff:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd42:4242:17::/48
-descr:              Jonathan Ferguson's IPv6 Tunnel Allocations
-remarks:            fd42:4242:0017:1::2/64 AS76136 GREinIPv6 2001:470:35:42b::2
-remarks:            fd42:4242:0017:2::2/64 AS4242420022 GREinIPv6 2001:19f0:7000:8ac5::64
-status:             ASSIGNED PA
 country:            SG
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Jonathan Ferguson's IPv6 Tunnel Allocations
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd42:4242:17::/48
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd44:8965:2e1c:2e76::_64 b/data/inet6num/fd44:8965:2e1c:2e76::_64
index 2f9b9fe89..4f3672e58 100644
--- a/data/inet6num/fd44:8965:2e1c:2e76::_64
+++ b/data/inet6num/fd44:8965:2e1c:2e76::_64
@@ -1,11 +1,10 @@
 inet6num:           fd44:8965:2e1c:2e76:0000:0000:0000:0000 - fd44:8965:2e1c:2e76:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd44:8965:2e1c:2e76::/64
-descr:              Matryoshka wlan3
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka wlan3
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd44:8965:2e1c:2e76::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd4e:adda:1964:e293::_64 b/data/inet6num/fd4e:adda:1964:e293::_64
index 393b601a8..e82d15df0 100644
--- a/data/inet6num/fd4e:adda:1964:e293::_64
+++ b/data/inet6num/fd4e:adda:1964:e293::_64
@@ -1,11 +1,10 @@
 inet6num:           fd4e:adda:1964:e293:0000:0000:0000:0000 - fd4e:adda:1964:e293:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd4e:adda:1964:e293::/64
-descr:              Matryoshka wlan6
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka wlan6
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd4e:adda:1964:e293::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd5f:fd18:29d1:4f61::_64 b/data/inet6num/fd5f:fd18:29d1:4f61::_64
index c1e4f21df..612ca424f 100644
--- a/data/inet6num/fd5f:fd18:29d1:4f61::_64
+++ b/data/inet6num/fd5f:fd18:29d1:4f61::_64
@@ -1,11 +1,10 @@
 inet6num:           fd5f:fd18:29d1:4f61:0000:0000:0000:0000 - fd5f:fd18:29d1:4f61:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd5f:fd18:29d1:4f61::/64
-descr:              Raspberry Pi eth0
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Raspberry Pi eth0
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd5f:fd18:29d1:4f61::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd70:336f:17f6:3465::_64 b/data/inet6num/fd70:336f:17f6:3465::_64
index 5ed792afe..7bacef5d8 100644
--- a/data/inet6num/fd70:336f:17f6:3465::_64
+++ b/data/inet6num/fd70:336f:17f6:3465::_64
@@ -1,11 +1,10 @@
 inet6num:           fd70:336f:17f6:3465:0000:0000:0000:0000 - fd70:336f:17f6:3465:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd70:336f:17f6:3465::/64
-descr:              Raspberry Pi wlan0
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Raspberry Pi wlan0
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd70:336f:17f6:3465::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd71:fd89:c4f0:6ea6::_64 b/data/inet6num/fd71:fd89:c4f0:6ea6::_64
index 3918258dd..bd33a21f5 100644
--- a/data/inet6num/fd71:fd89:c4f0:6ea6::_64
+++ b/data/inet6num/fd71:fd89:c4f0:6ea6::_64
@@ -1,11 +1,10 @@
 inet6num:           fd71:fd89:c4f0:6ea6:0000:0000:0000:0000 - fd71:fd89:c4f0:6ea6:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd71:fd89:c4f0:6ea6::/64
-descr:              Matryoshka wlan2
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka wlan2
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd71:fd89:c4f0:6ea6::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd79:f856:16d9:8882::_64 b/data/inet6num/fd79:f856:16d9:8882::_64
index a19b3b221..9be3a3811 100644
--- a/data/inet6num/fd79:f856:16d9:8882::_64
+++ b/data/inet6num/fd79:f856:16d9:8882::_64
@@ -1,11 +1,10 @@
 inet6num:           fd79:f856:16d9:8882:0000:0000:0000:0000 - fd79:f856:16d9:8882:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd79:f856:16d9:8882::/64
-descr:              Matryoshka bridge0
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka bridge0
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd79:f856:16d9:8882::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd88:2e46:4b1c:5988::_64 b/data/inet6num/fd88:2e46:4b1c:5988::_64
index 7a5db0e54..42969bc28 100644
--- a/data/inet6num/fd88:2e46:4b1c:5988::_64
+++ b/data/inet6num/fd88:2e46:4b1c:5988::_64
@@ -1,11 +1,10 @@
 inet6num:           fd88:2e46:4b1c:5988:0000:0000:0000:0000 - fd88:2e46:4b1c:5988:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd88:2e46:4b1c:5988::/64
-descr:              Matryoshka wlan1
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka wlan1
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd88:2e46:4b1c:5988::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd88:4903:4b9f:d66f::_64 b/data/inet6num/fd88:4903:4b9f:d66f::_64
index f40affbbf..c5e251427 100644
--- a/data/inet6num/fd88:4903:4b9f:d66f::_64
+++ b/data/inet6num/fd88:4903:4b9f:d66f::_64
@@ -1,11 +1,10 @@
 inet6num:           fd88:4903:4b9f:d66f:0000:0000:0000:0000 - fd88:4903:4b9f:d66f:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd88:4903:4b9f:d66f::/64
-descr:              Matryoshka wlan0
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka wlan0
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd88:4903:4b9f:d66f::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inet6num/fd97:b8af:629c:7d45::_64 b/data/inet6num/fd97:b8af:629c:7d45::_64
index 8a1f91acb..9ad7a423d 100644
--- a/data/inet6num/fd97:b8af:629c:7d45::_64
+++ b/data/inet6num/fd97:b8af:629c:7d45::_64
@@ -1,11 +1,10 @@
 inet6num:           fd97:b8af:629c:7d45:0000:0000:0000:0000 - fd97:b8af:629c:7d45:ffff:ffff:ffff:ffff
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               fd97:b8af:629c:7d45::/64
-descr:              Matryoshka wlan5
-status:             ASSIGNED PA
 country:            AU
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Matryoshka wlan5
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            fd97:b8af:629c:7d45::/64
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/inetnum/172.22.240.128_25 b/data/inetnum/172.22.240.128_25
index 8cbee3b35..4a34ac988 100644
--- a/data/inetnum/172.22.240.128_25
+++ b/data/inetnum/172.22.240.128_25
@@ -1,12 +1,10 @@
 inetnum:            172.22.240.128 - 172.22.240.255
-netname:            NET-JONATHAN-FERGUSON-DN42
+admin-c:            ENGINEER-FERGUSON-DN42
 cidr:               172.22.240.128/25
-descr:              Jonathan Ferguson's IPv4 Tunnel Allocations
-remarks:            172.22.240.130/30 AS76136 GREinIPv6 2001:470:35:42b::2
-remarks:            172.22.240.134/30 AS4242420022 GREinIPv6 2001:19f0:7000:8ac5::64
-status:             ASSIGNED PA
 country:            SG
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
+descr:              Jonathan Ferguson's IPv4 Tunnel Allocations
 mnt-by:             JONATHAN-FERGUSON-MNT
+netname:            172.22.240.128/25
 source:             DN42
+status:             ASSIGNED PI
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/key-cert/PGPKEY-13F8B1BC b/data/key-cert/PGPKEY-13F8B1BC
new file mode 100644
index 000000000..947ef064d
--- /dev/null
+++ b/data/key-cert/PGPKEY-13F8B1BC
@@ -0,0 +1,62 @@
+key-cert:           PGPKEY-13F8B1BC
+certif:             -----BEGIN PGP PUBLIC KEY BLOCK-----
+certif:             xsPuBFF+stkRDAC2NRKGMaA9w0H1z7aGtrAKz5jK+t32aJNI9e/Bf8oZAMVRrqf4
+certif:             wQyFYg2J7KfhZXfnGvVUOPQszQ7h9d9D3oj9GE/yoJkhYq0+kuow7shq0lq2B+dD
+certif:             sxs2MbZIHHM4G2AeLUw70NL++/ZKOGSVcAYRpkJ+PUX+Wkt3qSZO1WrMu3qXjW7V
+certif:             dwrV0NFbzP8NnBKGaMXSzdlkQNnAMgHcRqiXm6VClL+XARBN/tIDYLeTKr9MyEW8
+certif:             VAD1PGTGrqHL84O+VGNBs4kpl4pvCof53HTbnvkEEJ/jOHo/hs+ZnZhNv3QEYrn8
+certif:             mrGCFm4QIRlpi3dh0ivCm3DuECPGGRIWaIM9UAYqlJMhgMx3PZT/Tlut9OXkuOYR
+certif:             Ti8wzQrZAo3K6aO3ZRtIdjgaRJQq12IJIR1ca6O2WejgY87uV1eB87S1W6HroRCu
+certif:             0d2VWBL4WtBho9wC3AheM3F+JhIYjkaiSdb9d7crfIx83LgMVcPKCfEeqWV0rR9I
+certif:             jn0LL0l8+xyrYlcBANQ8cOd2kgNp26cG/HMElm0da653PJOjUK6iybOEro7dC/wI
+certif:             NvZlAykHx/1vf8HmEfH95m3j+WpE8JMv4ZBJLTur94TTvMsMJ8X7vUOM7wd+zvGZ
+certif:             KHo4ircRZ/LlLdTCBlwEWTHbY6Wwh8dw3np4G+65B4l99jvsDQ7uC2JIUbdB4vNY
+certif:             OzY9hYvjLGuD0m4A6WJYwX9QKlukH0t6C7qZoyvZzZstTTYInH/+cSy72ZwDg5lA
+certif:             0evd33ZTEistmYrfq2/FheNQ2YMu7anTG6V5dZy6n6HqcbXH5CpRcfn+Ws6Vj2Ft
+certif:             UUczt7IEiK7Vhhfom9bKRUhtd25BuToMnyfO+hF5r9qliKUeH50M1qKDRIMqYQWI
+certif:             cww6gcMm8rKipm48Yz5iNIZWtlg5EHYDJXE3lslFZ48UXtC4TXJwZYPEa/CU2b6E
+certif:             xfgxYbHbZ6vmTADyYHRJwZGRC5MuBkW8/nDgxqGSYRM2thBQ1QOuNxT2KFeGudhr
+certif:             p4JpMKx1E5GnSeE4nUXJJN435CfTkdArI5/APAD3FYHZhuM1ogMBL+cnlaxOQd0M
+certif:             AJqhSPqJMzQACTtNrnDzaT2OQEfzuWouku40FbT7adez1qivbZ9IVtcSaWm+C5f4
+certif:             LheW4YVaP9KNwc5pSqgUwPc7W4AcVajyxxBqlWqpunye4lY8VEqTUjYfstk8QwgV
+certif:             C6DW9FeTvi1mVRQg58qFD7BULRHWqK8LDTNJus2uJeyatzLaMhBuZn3YtBSlb9lG
+certif:             r+7rZzEFhz9BcKqFQSjf+C7y1lOYCQSdY/bvtpnmJN6jau8vCVmH+agwELx2LFRL
+certif:             tN5DLFQoJpA5g8Ierk497x+O/7wpftVwjXKx5WyoBd3aPfiZBgYYZengJOFS+89d
+certif:             fYoB48YBeOoBzubZ8mVjB9K3K+QeXQ1tl1yX2bae++JMNW4o1DUfAc0iuP4ZH1gW
+certif:             W9J+6oFK/ceGK8SebhGNAda/QEsT4Vv4ZhhMZSogc0m3E1N6s8EguLw9rFA8dwrT
+certif:             upRkwFfofFPXUKcNEkQ6IHzBMtZpSxnLGfBEIj4n/se6FduiOP1webieoOpyWhER
+certif:             Bs0+Sm9uYXRoYW4gRmVyZ3Vzb24gKE1hdHJ5b3Noa2EpIDxKb25hdGhhbi1GZXJn
+certif:             dXNvbkBsaXZlLmNvbS5hdT7CegQTEQgAIgUCUX6y2QIbAwYLCQgHAwIGFQgCCQoL
+certif:             BBYCAwECHgECF4AACgkQlbQ5DxP4sbwr3QD+JD/LAadvCBdEr4KglTGdYdaPDVck
+certif:             Pd1nT5sHNczK0MsBAMoj77E6LuiuZzr8cPoW3Y7zqmz4nSJaMikW1bkeoxCczsNN
+certif:             BFF+stkQEADBAxBUJtk2i9Hs4eDOvax0SAZeXRr2pUkdflaG3t3GDUB/cOX+k1iZ
+certif:             kg/kGHII8t6ta9s4x8ooxPBgV3h9D38jYSeGceDsz7omrNtag5G4rCtlxyBEegPd
+certif:             aQB9Ry2bUDCam9cP1hZ6UgOp1v1eEPcNcuK7DFeTldYVX4ahfGvNzdK1bDQtumLk
+certif:             Fw//MfZDTlvx7b7ZzsGSKuMChyO1mVcvdDlitnIqyF0QYnEqkDh+uCmEGr5aODEU
+certif:             lmeK7WqNJNXquimEwIfUoUVnA/WNOMLNBcruWUlh9NIEpryHox9G7ggOhYdLvEyJ
+certif:             urbI5UXIgJNzyf3rbFnXy2rHb6v9yvPwWHt8SdW8u29ThrAAEBGIYWgQKsh52EjS
+certif:             xg/aulvLdOPkCrb/vTP4SxAB+jJXlEtfGhHYgCyFEota0yI3REOAUaUHk9wN8Lio
+certif:             Y5Lcqo1xqYfoRLop/5aqAOR8Y3n6s9JOdheT82xNLsCp67e1b62fQGcQ36pLhDLZ
+certif:             MZz7VrqiY4qgTukkew6Dk6HAlZdH+b+UGeiuBilgf/uJgA0MasNUSjny68OTIRY9
+certif:             LeSkpZ/Dg7Akey62qZ7trnTxdXiFOPD0NOE9JrAkDWaVLu9bg3BM5ynTqAsEmQec
+certif:             rWmul8IdDlIf20WQS8YS16bKH7ONfNL5Hq3k2Q7cRkGb8jtvXmrQLwADBQ/+JTZV
+certif:             RQiLL3MeSkMARkOUdBw/zvZrXwG+hMOtLyJYU2/i5S3vTGsJ1M0FRktYfs1WyoMp
+certif:             DM1IdxThC2NsJRSVD3uVUZZGc6NCi8xs2kBIkvNlbKO5xnZ/1sF46JKw0ZcRPurH
+certif:             pDpU63WfhRt6nZpTloRVAuhn8Qug/LMlE8CdrjAlmB+j/iLIbVqUTzdkxMuoR/5O
+certif:             AWuBy5d4yojhUCxnoYRZXXJFgjmhV7B05t0vcunKwmJnU2VGINv/S3ZxEnU+eXDV
+certif:             9HeqdlWiFh+dn4Hb3ceEv3/VCgBFX51khrWr6X5nba2lSuiAoTMG3c7o+M2kwdGi
+certif:             qVpa0HKy74p0VKJyd2upXikaLHzlCBF5Sk3BzHlG/qvLcYyil4YhIvwtcKgrMiK0
+certif:             8W5q8gfiSHaqPHPsUSl8w/iHenUYRU/AlkGhUOLeaDGfHWOwJTngbCJKxbYansmB
+certif:             /Zk83R0cfHEC2pruAMwMzgE0d3WI65IUPiBJDG0bLPp557G+RWqc+vjor8pPOha0
+certif:             wtmzNE8iBU8lvW+QZMc5E4mVDrAn5l4B5mtkW0ouOFg+8UViEENKQL2H8BTHOn07
+certif:             MR++bjy1m8OMKtnMIXO0XQejoffBcS1oqYSYj7LJAARzmC1ZzYBhLCYMURiFmWzb
+certif:             vRA/6DshI3JNDES/evTriioJJKKZO3xOYazSxXfCYQQYEQgACQUCUX6y2QIbDAAK
+certif:             CRCVtDkPE/ixvCQgAP9alD3T42MTzI43Rh0Rr4g6mbfK6P0voWFQgwX+npG1WAEA
+certif:             v8GXSJM0FBpm0EVm3wxYPUamYFgeKyCwI/OWjdFUS24=
+certif:             =cCps
+certif:             -----END PGP PUBLIC KEY BLOCK-----
+fingerpr:           74D6C5D153B44D3D12AF2DD295B4390F13F8B1BC
+method:             PGP
+mnt-by:             JONATHAN-FERGUSON-MNT
+owner:              Jonathan Ferguson <jonathan-ferguson@live.com.au>
+source:             DN42
diff --git a/data/mntner/JONATHAN-FERGUSON-MNT b/data/mntner/JONATHAN-FERGUSON-MNT
index a3b8f13fe..b9e25fd4e 100644
--- a/data/mntner/JONATHAN-FERGUSON-MNT
+++ b/data/mntner/JONATHAN-FERGUSON-MNT
@@ -1,8 +1,8 @@
 mntner:             JONATHAN-FERGUSON-MNT
+admin-c:            ENGINEER-FERGUSON-DN42
+auth:               PGPKEY-13F8B1BC
+auth:               pgp-fingerprint 74D6C5D153B44D3D12AF2DD295B4390F13F8B1BC
 descr:              Jonathan Ferguson
-abuse-mailbox:      Jonathan-Ferguson@live.com.au
-remarks:            AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 mnt-by:             JONATHAN-FERGUSON-MNT
 source:             DN42
+tech-c:             ENGINEER-FERGUSON-DN42
diff --git a/data/person/FERGUSON-DN42 b/data/person/FERGUSON-DN42
index a4433ebf1..fe5e48187 100644
--- a/data/person/FERGUSON-DN42
+++ b/data/person/FERGUSON-DN42
@@ -1,7 +1,6 @@
 person:             Jonathan Ferguson
 nic-hdl:            FERGUSON-DN42
-remarks:            AS4242420017
-e-mail:             Jonathan-Ferguson@live.com.au
-www:                http://Jonathan-Ferguson.tk/
+address:            AU
+e-mail:             jonathan-ferguson@live.com.au
 mnt-by:             JONATHAN-FERGUSON-MNT
 source:             DN42
diff --git a/data/role/ENGINEER-FERGUSON-DN42 b/data/role/ENGINEER-FERGUSON-DN42
new file mode 100644
index 000000000..a36cae71f
--- /dev/null
+++ b/data/role/ENGINEER-FERGUSON-DN42
@@ -0,0 +1,4 @@
+role:               Engineer
+mnt-by:             JONATHAN-FERGUSON-MNT
+nic-hdl:            ENGINEER-FERGUSON-DN42
+source:             DN42
diff --git a/data/route/172.22.240.128_25 b/data/route/172.22.240.128_25
index d1a79e41c..399f30022 100644
--- a/data/route/172.22.240.128_25
+++ b/data/route/172.22.240.128_25
@@ -1,6 +1,4 @@
 route:              172.22.240.128/25
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd01:38f7:e6d8:4e04::_64 b/data/route6/fd01:38f7:e6d8:4e04::_64
index f9c97f074..5c2ee6963 100644
--- a/data/route6/fd01:38f7:e6d8:4e04::_64
+++ b/data/route6/fd01:38f7:e6d8:4e04::_64
@@ -1,6 +1,4 @@
 route6:             fd01:38f7:e6d8:4e04::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd1d:62fd:3f4c:a247::_64 b/data/route6/fd1d:62fd:3f4c:a247::_64
index aeb444a78..a2d344b6a 100644
--- a/data/route6/fd1d:62fd:3f4c:a247::_64
+++ b/data/route6/fd1d:62fd:3f4c:a247::_64
@@ -1,6 +1,4 @@
 route6:             fd1d:62fd:3f4c:a247::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd32:54d6:1962:ad35::_64 b/data/route6/fd32:54d6:1962:ad35::_64
index 3b4163eee..ad65bd29e 100644
--- a/data/route6/fd32:54d6:1962:ad35::_64
+++ b/data/route6/fd32:54d6:1962:ad35::_64
@@ -1,6 +1,4 @@
 route6:             fd32:54d6:1962:ad35::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd42:4242:17::_48 b/data/route6/fd42:4242:17::_48
index 580a77a1a..b5d220739 100644
--- a/data/route6/fd42:4242:17::_48
+++ b/data/route6/fd42:4242:17::_48
@@ -1,6 +1,4 @@
 route6:             fd42:4242:17::/48
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd44:8965:2e1c:2e76::_64 b/data/route6/fd44:8965:2e1c:2e76::_64
index 9bc31e5f7..dfb89df2a 100644
--- a/data/route6/fd44:8965:2e1c:2e76::_64
+++ b/data/route6/fd44:8965:2e1c:2e76::_64
@@ -1,6 +1,4 @@
 route6:             fd44:8965:2e1c:2e76::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd4e:adda:1964:e293::_64 b/data/route6/fd4e:adda:1964:e293::_64
index 0c212bd68..7e7e017c9 100644
--- a/data/route6/fd4e:adda:1964:e293::_64
+++ b/data/route6/fd4e:adda:1964:e293::_64
@@ -1,6 +1,4 @@
 route6:             fd4e:adda:1964:e293::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd5f:fd18:29d1:4f61::_64 b/data/route6/fd5f:fd18:29d1:4f61::_64
index aba3cc043..beaa1daf0 100644
--- a/data/route6/fd5f:fd18:29d1:4f61::_64
+++ b/data/route6/fd5f:fd18:29d1:4f61::_64
@@ -1,6 +1,4 @@
 route6:             fd5f:fd18:29d1:4f61::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd70:336f:17f6:3465::_64 b/data/route6/fd70:336f:17f6:3465::_64
index 2b8e10460..b89a4b919 100644
--- a/data/route6/fd70:336f:17f6:3465::_64
+++ b/data/route6/fd70:336f:17f6:3465::_64
@@ -1,6 +1,4 @@
 route6:             fd70:336f:17f6:3465::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd71:fd89:c4f0:6ea6::_64 b/data/route6/fd71:fd89:c4f0:6ea6::_64
index 411c62478..697c0e64a 100644
--- a/data/route6/fd71:fd89:c4f0:6ea6::_64
+++ b/data/route6/fd71:fd89:c4f0:6ea6::_64
@@ -1,6 +1,4 @@
 route6:             fd71:fd89:c4f0:6ea6::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd79:f856:16d9:8882::_64 b/data/route6/fd79:f856:16d9:8882::_64
index a505276f1..e3fcd8353 100644
--- a/data/route6/fd79:f856:16d9:8882::_64
+++ b/data/route6/fd79:f856:16d9:8882::_64
@@ -1,6 +1,4 @@
 route6:             fd79:f856:16d9:8882::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd88:2e46:4b1c:5988::_64 b/data/route6/fd88:2e46:4b1c:5988::_64
index 916aa230a..7d16dc309 100644
--- a/data/route6/fd88:2e46:4b1c:5988::_64
+++ b/data/route6/fd88:2e46:4b1c:5988::_64
@@ -1,6 +1,4 @@
 route6:             fd88:2e46:4b1c:5988::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd88:4903:4b9f:d66f::_64 b/data/route6/fd88:4903:4b9f:d66f::_64
index 387fb4512..bbc0f21ce 100644
--- a/data/route6/fd88:4903:4b9f:d66f::_64
+++ b/data/route6/fd88:4903:4b9f:d66f::_64
@@ -1,6 +1,4 @@
 route6:             fd88:4903:4b9f:d66f::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42
diff --git a/data/route6/fd97:b8af:629c:7d45::_64 b/data/route6/fd97:b8af:629c:7d45::_64
index e93d38dd8..8a1db710b 100644
--- a/data/route6/fd97:b8af:629c:7d45::_64
+++ b/data/route6/fd97:b8af:629c:7d45::_64
@@ -1,6 +1,4 @@
 route6:             fd97:b8af:629c:7d45::/64
 mnt-by:             JONATHAN-FERGUSON-MNT
 origin:             AS4242420017
-admin-c:            FERGUSON-DN42
-tech-c:             FERGUSON-DN42
 source:             DN42