diff --git a/contracts/ens/AbstractENS.sol b/contracts/ens/AbstractENS.sol
deleted file mode 100644
index 9a6fb7c..0000000
--- a/contracts/ens/AbstractENS.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-pragma solidity ^0.4.17;
-
-import "./Resolver.sol";
-
-contract AbstractENS {
-    function owner(bytes32 node) public constant returns (address);
-    function resolver(bytes32 node) public constant returns (Resolver);
-    function ttl(bytes32 node) public constant returns (uint64);
-    function setOwner(bytes32 node, address owner) public;
-    function setSubnodeOwner(bytes32 node, bytes32 label, address owner) public;
-    function setResolver(bytes32 node, address resolver) public;
-    function setTTL(bytes32 node, uint64 ttl) public;
-
-    // Logged when the owner of a node assigns a new owner to a subnode.
-    event NewOwner(bytes32 indexed node, bytes32 indexed label, address owner);
-
-    // Logged when the owner of a node transfers ownership to a new account.
-    event Transfer(bytes32 indexed node, address owner);
-
-    // Logged when the resolver for a node changes.
-    event NewResolver(bytes32 indexed node, address resolver);
-
-    // Logged when the TTL of a node changes
-    event NewTTL(bytes32 indexed node, uint64 ttl);
-}
diff --git a/contracts/ens/ENS.sol b/contracts/ens/ENS.sol
index 42960e3..52db24e 100644
--- a/contracts/ens/ENS.sol
+++ b/contracts/ens/ENS.sol
@@ -1,14 +1,24 @@
-pragma solidity ^0.4.17;
+pragma solidity ^0.4.21;
 
-import "./Resolver.sol";
+interface ENS {
 
+    // Logged when the owner of a node assigns a new owner to a subnode.
+    event NewOwner(bytes32 indexed node, bytes32 indexed label, address owner);
 
-contract ENS {
-    function owner(bytes32 node) public constant returns (address);
-    function resolver(bytes32 node) public constant returns (Resolver);
-    function ttl(bytes32 node) public constant returns (uint64);
-    function setOwner(bytes32 node, address owner) public;
-    function setSubnodeOwner(bytes32 node, bytes32 label, address owner) public;
-    function setResolver(bytes32 node, address resolver) public;
-    function setTTL(bytes32 node, uint64 ttl) public;
-}
\ No newline at end of file
+    // Logged when the owner of a node transfers ownership to a new account.
+    event Transfer(bytes32 indexed node, address owner);
+
+    // Logged when the resolver for a node changes.
+    event NewResolver(bytes32 indexed node, address resolver);
+
+    // Logged when the TTL of a node changes
+    event NewTTL(bytes32 indexed node, uint64 ttl);
+
+    function setOwner(bytes32 _node, address _owner) external;
+    function setSubnodeOwner(bytes32 _node, bytes32 _label, address _owner) external;
+    function setResolver(bytes32 _node, address _resolver) external;
+    function setTTL(bytes32 _node, uint64 _ttl) external;
+    function owner(bytes32 _node) external view returns (address);
+    function resolver(bytes32 _node) external view returns (address);
+    function ttl(bytes32 _node) external view returns (uint64);
+}
diff --git a/contracts/ens/PublicResolver.sol b/contracts/ens/PublicResolver.sol
new file mode 100644
index 0000000..9dab586
--- /dev/null
+++ b/contracts/ens/PublicResolver.sol
@@ -0,0 +1,214 @@
+pragma solidity ^0.4.18;
+
+import './ENS.sol';
+
+/**
+ * A simple resolver anyone can use; only allows the owner of a node to set its
+ * address.
+ */
+contract PublicResolver {
+
+    bytes4 constant INTERFACE_META_ID = 0x01ffc9a7;
+    bytes4 constant ADDR_INTERFACE_ID = 0x3b3b57de;
+    bytes4 constant CONTENT_INTERFACE_ID = 0xd8389dc5;
+    bytes4 constant NAME_INTERFACE_ID = 0x691f3431;
+    bytes4 constant ABI_INTERFACE_ID = 0x2203ab56;
+    bytes4 constant PUBKEY_INTERFACE_ID = 0xc8690233;
+    bytes4 constant TEXT_INTERFACE_ID = 0x59d1d43c;
+
+    event AddrChanged(bytes32 indexed node, address a);
+    event ContentChanged(bytes32 indexed node, bytes32 hash);
+    event NameChanged(bytes32 indexed node, string name);
+    event ABIChanged(bytes32 indexed node, uint256 indexed contentType);
+    event PubkeyChanged(bytes32 indexed node, bytes32 x, bytes32 y);
+    event TextChanged(bytes32 indexed node, string indexedKey, string key);
+
+    struct PublicKey {
+        bytes32 x;
+        bytes32 y;
+    }
+
+    struct Record {
+        address addr;
+        bytes32 content;
+        string name;
+        PublicKey pubkey;
+        mapping(string=>string) text;
+        mapping(uint256=>bytes) abis;
+    }
+
+    ENS ens;
+
+    mapping (bytes32 => Record) records;
+
+    modifier only_owner(bytes32 node) {
+        require(ens.owner(node) == msg.sender);
+        _;
+    }
+
+    /**
+     * Constructor.
+     * @param ensAddr The ENS registrar contract.
+     */
+    function PublicResolver(ENS ensAddr) public {
+        ens = ensAddr;
+    }
+
+    /**
+     * Sets the address associated with an ENS node.
+     * May only be called by the owner of that node in the ENS registry.
+     * @param node The node to update.
+     * @param addr The address to set.
+     */
+    function setAddr(bytes32 node, address addr) public only_owner(node) {
+        records[node].addr = addr;
+        AddrChanged(node, addr);
+    }
+
+    /**
+     * Sets the content hash associated with an ENS node.
+     * May only be called by the owner of that node in the ENS registry.
+     * Note that this resource type is not standardized, and will likely change
+     * in future to a resource type based on multihash.
+     * @param node The node to update.
+     * @param hash The content hash to set
+     */
+    function setContent(bytes32 node, bytes32 hash) public only_owner(node) {
+        records[node].content = hash;
+        ContentChanged(node, hash);
+    }
+    
+    /**
+     * Sets the name associated with an ENS node, for reverse records.
+     * May only be called by the owner of that node in the ENS registry.
+     * @param node The node to update.
+     * @param name The name to set.
+     */
+    function setName(bytes32 node, string name) public only_owner(node) {
+        records[node].name = name;
+        NameChanged(node, name);
+    }
+
+    /**
+     * Sets the ABI associated with an ENS node.
+     * Nodes may have one ABI of each content type. To remove an ABI, set it to
+     * the empty string.
+     * @param node The node to update.
+     * @param contentType The content type of the ABI
+     * @param data The ABI data.
+     */
+    function setABI(bytes32 node, uint256 contentType, bytes data) public only_owner(node) {
+        // Content types must be powers of 2
+        require(((contentType - 1) & contentType) == 0);
+        
+        records[node].abis[contentType] = data;
+        ABIChanged(node, contentType);
+    }
+    
+    /**
+     * Sets the SECP256k1 public key associated with an ENS node.
+     * @param node The ENS node to query
+     * @param x the X coordinate of the curve point for the public key.
+     * @param y the Y coordinate of the curve point for the public key.
+     */
+    function setPubkey(bytes32 node, bytes32 x, bytes32 y) public only_owner(node) {
+        records[node].pubkey = PublicKey(x, y);
+        PubkeyChanged(node, x, y);
+    }
+
+    /**
+     * Sets the text data associated with an ENS node and key.
+     * May only be called by the owner of that node in the ENS registry.
+     * @param node The node to update.
+     * @param key The key to set.
+     * @param value The text data value to set.
+     */
+    function setText(bytes32 node, string key, string value) public only_owner(node) {
+        records[node].text[key] = value;
+        TextChanged(node, key, key);
+    }
+
+    /**
+     * Returns the text data associated with an ENS node and key.
+     * @param node The ENS node to query.
+     * @param key The text data key to query.
+     * @return The associated text data.
+     */
+    function text(bytes32 node, string key) public view returns (string) {
+        return records[node].text[key];
+    }
+
+    /**
+     * Returns the SECP256k1 public key associated with an ENS node.
+     * Defined in EIP 619.
+     * @param node The ENS node to query
+     * @return x, y the X and Y coordinates of the curve point for the public key.
+     */
+    function pubkey(bytes32 node) public view returns (bytes32 x, bytes32 y) {
+        return (records[node].pubkey.x, records[node].pubkey.y);
+    }
+
+    /**
+     * Returns the ABI associated with an ENS node.
+     * Defined in EIP205.
+     * @param node The ENS node to query
+     * @param contentTypes A bitwise OR of the ABI formats accepted by the caller.
+     * @return contentType The content type of the return value
+     * @return data The ABI data
+     */
+    function ABI(bytes32 node, uint256 contentTypes) public view returns (uint256 contentType, bytes data) {
+        Record storage record = records[node];
+        for (contentType = 1; contentType <= contentTypes; contentType <<= 1) {
+            if ((contentType & contentTypes) != 0 && record.abis[contentType].length > 0) {
+                data = record.abis[contentType];
+                return;
+            }
+        }
+        contentType = 0;
+    }
+
+    /**
+     * Returns the name associated with an ENS node, for reverse records.
+     * Defined in EIP181.
+     * @param node The ENS node to query.
+     * @return The associated name.
+     */
+    function name(bytes32 node) public view returns (string) {
+        return records[node].name;
+    }
+
+    /**
+     * Returns the content hash associated with an ENS node.
+     * Note that this resource type is not standardized, and will likely change
+     * in future to a resource type based on multihash.
+     * @param node The ENS node to query.
+     * @return The associated content hash.
+     */
+    function content(bytes32 node) public view returns (bytes32) {
+        return records[node].content;
+    }
+
+    /**
+     * Returns the address associated with an ENS node.
+     * @param node The ENS node to query.
+     * @return The associated address.
+     */
+    function addr(bytes32 node) public view returns (address) {
+        return records[node].addr;
+    }
+
+    /**
+     * Returns true if the resolver implements the interface specified by the provided hash.
+     * @param interfaceID The ID of the interface to check for.
+     * @return True if the contract implements the requested interface.
+     */
+    function supportsInterface(bytes4 interfaceID) public pure returns (bool) {
+        return interfaceID == ADDR_INTERFACE_ID ||
+        interfaceID == CONTENT_INTERFACE_ID ||
+        interfaceID == NAME_INTERFACE_ID ||
+        interfaceID == ABI_INTERFACE_ID ||
+        interfaceID == PUBKEY_INTERFACE_ID ||
+        interfaceID == TEXT_INTERFACE_ID ||
+        interfaceID == INTERFACE_META_ID;
+    }
+}
diff --git a/contracts/ens/PublicResolverInterface.sol b/contracts/ens/PublicResolverInterface.sol
deleted file mode 100644
index b6ac0d8..0000000
--- a/contracts/ens/PublicResolverInterface.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-pragma solidity ^0.4.17;
-
-contract PublicResolverInterface {
-    function supportsInterface(bytes4 interfaceID) public constant returns (bool);
-    function addr(bytes32 node) public constant returns (address ret);
-    function setAddr(bytes32 node, address addr) public;
-    function hash(bytes32 node) public constant returns (bytes32 ret);
-    function setHash(bytes32 node, bytes32 hash) public;
-}
diff --git a/contracts/ens/Resolver.sol b/contracts/ens/Resolver.sol
deleted file mode 100644
index f111f4f..0000000
--- a/contracts/ens/Resolver.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma solidity ^0.4.17;
-
-contract Resolver {
-    function addr(bytes32 node) public constant returns (address);
-}
\ No newline at end of file
diff --git a/contracts/ens/ResolverInterface.sol b/contracts/ens/ResolverInterface.sol
new file mode 100644
index 0000000..006bf20
--- /dev/null
+++ b/contracts/ens/ResolverInterface.sol
@@ -0,0 +1,10 @@
+pragma solidity ^0.4.18;
+
+contract ResolverInterface {
+    function PublicResolver(address ensAddr) public;
+    function setAddr(bytes32 node, address addr) public;
+    function setHash(bytes32 node, bytes32 hash) public;
+    function addr(bytes32 node) public view returns (address);
+    function hash(bytes32 node) public view returns (bytes32);
+    function supportsInterface(bytes4 interfaceID) public pure returns (bool);
+}