diff --git a/phpmon/Domain/DomainList/AddProxyVC.swift b/phpmon/Domain/DomainList/AddProxyVC.swift
index 2987234..e7019f8 100644
--- a/phpmon/Domain/DomainList/AddProxyVC.swift
+++ b/phpmon/Domain/DomainList/AddProxyVC.swift
@@ -63,6 +63,8 @@ class AddProxyVC: NSViewController, NSTextFieldDelegate {
     }
     
     @IBAction func pressedCreateProxy(_ sender: Any) {
+        // TODO: Validate the input before allowing proxy creation
+        
         let domain = self.inputDomainName.stringValue
         let proxyName = self.inputProxySubject.stringValue
         let secure = self.buttonSecure.state == .on ? " --secure" : ""
diff --git a/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift b/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift
index fb298d2..7a0539c 100644
--- a/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift
+++ b/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift
@@ -10,6 +10,8 @@ import Cocoa
 
 extension DomainListVC {
     
+    // TODO: Add context menu for proxies
+    
     internal func reloadContextMenu() {
         guard let site = selectedSite else {
             tableView.menu = nil
diff --git a/phpmon/Domain/Integrations/Composer/PhpFrameworks.swift b/phpmon/Domain/Integrations/Composer/PhpFrameworks.swift
index 04e726d..e7f07a2 100644
--- a/phpmon/Domain/Integrations/Composer/PhpFrameworks.swift
+++ b/phpmon/Domain/Integrations/Composer/PhpFrameworks.swift
@@ -39,7 +39,7 @@ struct PhpFrameworks {
         "zendframework/zend-mvc": "Zend",
         "typo3/cms-core": "Typo3",
         
-        // TODO (5.1): Handle these in v5.1
+        // TODO (6.0): Handle these in v6.0
         // "magento/*": "Magento",
         // "concrete5/*": "Concrete5",
         // "contao/*": "Contao",