diff --git a/app/models/contact.rb b/app/models/contact.rb
index d22b6f87c..2682f3e5f 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -1,3 +1,6 @@
 class Contact < ActiveRecord::Base
+  #TODO Estonian id validation
+  #TODO Foreign contact will get email with activation link/username/temp password
+  #TODO Phone number validation, in first phase very minimam in order to support current registries
   has_many :addresses
 end
diff --git a/app/models/domain.rb b/app/models/domain.rb
index b12c790c9..20954f27e 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -1,4 +1,8 @@
 class Domain < ActiveRecord::Base
+  #TODO whois requests ip whitelist for full info for own domains and partial info for other domains
+  #TODO most inputs should be trimmed before validatation, probably some global logic?
+ 
+
   belongs_to :registrar
   belongs_to :ns_set
   belongs_to :owner_contact, class_name: 'Contact'
diff --git a/app/models/epp_user.rb b/app/models/epp_user.rb
index 873699580..7f7c0b2bb 100644
--- a/app/models/epp_user.rb
+++ b/app/models/epp_user.rb
@@ -1,3 +1,4 @@
 class EppUser < ActiveRecord::Base
+  #TODO should have max request limit per day
   belongs_to :registrar
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index cacbd61cb..e2f996d4c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,7 @@
 class User < ActiveRecord::Base
+  #TODO Foreign user will get email with activation link,email,temp-password.
+  #After activisation, system should require to change temp password.
+  #TODO Estonian id validation
+
   belongs_to :role
 end
diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb
index 3101a35a3..51160b629 100644
--- a/app/validators/domain_name_validator.rb
+++ b/app/validators/domain_name_validator.rb
@@ -1,4 +1,11 @@
 class DomainNameValidator < ActiveModel::EachValidator
+  #TODO 
+  # validates lenght of 2-63
+  # validates/honours Estonian additional letters zäõüö
+  # honours punicode and all interfces honors utf8
+  # validates lower level domains (.pri.ee, edu.ee etc)
+  # lower level domains are fixed for .ee and can add statically into settings
+
   def validate_each(record, attribute, value)
     unless self.class.validate(value)
       record.errors[attribute] << (options[:message] || 'invalid format')