diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bbe55e3a..50b0f743 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 require_dependency "login_system"
 require_dependency "tracks/source_view"
 
diff --git a/app/controllers/calendar_controller.rb b/app/controllers/calendar_controller.rb
index ae0680e3..cda8c071 100644
--- a/app/controllers/calendar_controller.rb
+++ b/app/controllers/calendar_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class CalendarController < ApplicationController
   skip_before_action :login_required, :only => [:show]
   prepend_before_action :login_or_feed_token_required, :only => [:show]
diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb
index b8feeb6e..4c0eda49 100644
--- a/app/controllers/contexts_controller.rb
+++ b/app/controllers/contexts_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ContextsController < ApplicationController
 
   helper :todos
diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb
index 32d751c8..a6335372 100644
--- a/app/controllers/data_controller.rb
+++ b/app/controllers/data_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class DataController < ApplicationController
 
   require 'csv'
diff --git a/app/controllers/feedlist_controller.rb b/app/controllers/feedlist_controller.rb
index e4f24dda..7cb211db 100644
--- a/app/controllers/feedlist_controller.rb
+++ b/app/controllers/feedlist_controller.rb
@@ -1,3 +1,4 @@
+# typed: true
 class FeedlistController < ApplicationController
 
   helper :feedlist
diff --git a/app/controllers/integrations_controller.rb b/app/controllers/integrations_controller.rb
index dcab4e9d..e7ad934c 100644
--- a/app/controllers/integrations_controller.rb
+++ b/app/controllers/integrations_controller.rb
@@ -1,3 +1,4 @@
+# typed: true
 class IntegrationsController < ApplicationController
   require 'mail'
 
diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
index 4331c550..27098af9 100644
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class LoginController < ApplicationController
 
   layout 'login'
diff --git a/app/controllers/mailgun_controller.rb b/app/controllers/mailgun_controller.rb
index 50c929a4..5f3cf2a1 100644
--- a/app/controllers/mailgun_controller.rb
+++ b/app/controllers/mailgun_controller.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'openssl'
 
 class MailgunController < ApplicationController
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 0b60bd6a..a7448a69 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class NotesController < ApplicationController
 
   before_action :set_source_view
diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index 4781f121..17b99329 100644
--- a/app/controllers/preferences_controller.rb
+++ b/app/controllers/preferences_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class PreferencesController < ApplicationController
 
   def index
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ee9f151a..c1ed1b99 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ProjectsController < ApplicationController
 
   helper :application, :todos, :notes
diff --git a/app/controllers/recurring_todos/form_helper.rb b/app/controllers/recurring_todos/form_helper.rb
index adbdff7d..d2d95a16 100644
--- a/app/controllers/recurring_todos/form_helper.rb
+++ b/app/controllers/recurring_todos/form_helper.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class FormHelper
diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb
index 05ab6878..6badec06 100644
--- a/app/controllers/recurring_todos_controller.rb
+++ b/app/controllers/recurring_todos_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class RecurringTodosController < ApplicationController
 
   helper :todos, :recurring_todos
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 98fae72a..6f8af2ea 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,3 +1,4 @@
+# typed: true
 class SearchController < ApplicationController
 
   helper :todos, :application, :notes, :projects, :contexts
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 39b1c908..ecd8becc 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class StatsController < ApplicationController
 
   SECONDS_PER_DAY = 86400;
diff --git a/app/controllers/todos/todo_create_params_helper.rb b/app/controllers/todos/todo_create_params_helper.rb
index 32d1baab..1c2e8f40 100644
--- a/app/controllers/todos/todo_create_params_helper.rb
+++ b/app/controllers/todos/todo_create_params_helper.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Todos
   class TodoCreateParamsHelper
 
diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index a23419b8..9ea89e26 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class TodosController < ApplicationController
 
   skip_before_action :login_required, :only => [:index, :tag, :list_deferred, :show, :list_hidden, :done]
@@ -45,7 +46,7 @@ class TodosController < ApplicationController
         @page_title = t('todos.mobile_todos_page_title')
         @home = true
 
-        cookies[:mobile_url]= { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
+        cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
         determine_down_count
 
         render :action => 'index'.freeze
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index df04d9da..dc1e3fad 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,3 +1,4 @@
+# typed: false
 class UsersController < ApplicationController
 
   before_action :admin_login_required, :only => [ :index, :show, :destroy ]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 16ff38f0..4041b4e8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module ApplicationHelper
 
   def group_view_by_menu_entry
diff --git a/app/helpers/backend_helper.rb b/app/helpers/backend_helper.rb
index 2414c125..55147516 100644
--- a/app/helpers/backend_helper.rb
+++ b/app/helpers/backend_helper.rb
@@ -1,2 +1,3 @@
+# typed: strong
 module BackendHelper
 end
diff --git a/app/helpers/bootstrap_flash_helper.rb b/app/helpers/bootstrap_flash_helper.rb
index 04ea47bf..8ccb6d62 100644
--- a/app/helpers/bootstrap_flash_helper.rb
+++ b/app/helpers/bootstrap_flash_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module BootstrapFlashHelper
   ALERT_MAPPING = {
     :notice => :success,
diff --git a/app/helpers/contexts_helper.rb b/app/helpers/contexts_helper.rb
index 40636bbd..f23d438d 100644
--- a/app/helpers/contexts_helper.rb
+++ b/app/helpers/contexts_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module ContextsHelper
 
   def show_context_name(context)
diff --git a/app/helpers/data_helper.rb b/app/helpers/data_helper.rb
index e68f25eb..4e8e37b1 100644
--- a/app/helpers/data_helper.rb
+++ b/app/helpers/data_helper.rb
@@ -1,2 +1,3 @@
+# typed: strong
 module DataHelper
 end
diff --git a/app/helpers/date_label_helper.rb b/app/helpers/date_label_helper.rb
index 7bff81d8..bc69fa4f 100644
--- a/app/helpers/date_label_helper.rb
+++ b/app/helpers/date_label_helper.rb
@@ -1,3 +1,4 @@
+# typed: true
 module DateLabelHelper
 
   class GenericDateView
diff --git a/app/helpers/feedlist_helper.rb b/app/helpers/feedlist_helper.rb
index 3a5ce17a..a13d78f1 100644
--- a/app/helpers/feedlist_helper.rb
+++ b/app/helpers/feedlist_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module FeedlistHelper
 
   def linkoptions(format, options)
diff --git a/app/helpers/icon_helper.rb b/app/helpers/icon_helper.rb
index 3fb817fa..7a96f5d5 100644
--- a/app/helpers/icon_helper.rb
+++ b/app/helpers/icon_helper.rb
@@ -1,3 +1,4 @@
+# typed: true
 module IconHelper
   include FontAwesome::Sass::Rails::ViewHelpers
 
diff --git a/app/helpers/integrations_helper.rb b/app/helpers/integrations_helper.rb
index e6b84107..34783893 100644
--- a/app/helpers/integrations_helper.rb
+++ b/app/helpers/integrations_helper.rb
@@ -1,2 +1,3 @@
+# typed: strong
 module IntegrationsHelper
 end
diff --git a/app/helpers/login_helper.rb b/app/helpers/login_helper.rb
index 4b4d6e71..a9c2933e 100644
--- a/app/helpers/login_helper.rb
+++ b/app/helpers/login_helper.rb
@@ -1,3 +1,4 @@
+# typed: strong
 module LoginHelper
 
 end
diff --git a/app/helpers/mobile_helper.rb b/app/helpers/mobile_helper.rb
index c5b21b82..7763babc 100644
--- a/app/helpers/mobile_helper.rb
+++ b/app/helpers/mobile_helper.rb
@@ -1,2 +1,3 @@
+# typed: strong
 module MobileHelper
 end
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 0e62f5a4..be403e05 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module NotesHelper
   def truncated_note(note, characters = 50)
     render_text(truncate(note.body, :length => characters, :omission => "..."))
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index e8cbafe9..771faa82 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module PreferencesHelper
 
   def pref(model, pref_name, &block)
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 40175c54..0972424a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module ProjectsHelper
 
   def show_project_name(project)
diff --git a/app/helpers/recurring_todos_helper.rb b/app/helpers/recurring_todos_helper.rb
index c9ade8cd..a573c2ef 100644
--- a/app/helpers/recurring_todos_helper.rb
+++ b/app/helpers/recurring_todos_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module RecurringTodosHelper
 
   def recurring_todo_tag_list
diff --git a/app/helpers/rendering_helper.rb b/app/helpers/rendering_helper.rb
index 76166bfa..11787fbd 100644
--- a/app/helpers/rendering_helper.rb
+++ b/app/helpers/rendering_helper.rb
@@ -1,3 +1,4 @@
+# typed: ignore
 module RenderingHelper
   AUTO_LINK_MESSAGE_RE = %r{message://<[^>]+>} unless const_defined?(:AUTO_LINK_MESSAGE_RE)
 
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index b3ce20ac..94ed6845 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -1,2 +1,3 @@
+# typed: strong
 module SearchHelper
 end
diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb
index 94e93ae2..a8883c8c 100644
--- a/app/helpers/stats_helper.rb
+++ b/app/helpers/stats_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module StatsHelper
 
   def font_size(cloud, tag)
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 8b04e928..3cb583c7 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'staleness'
 
 module TodosHelper
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 8f4db7bd..b5a766be 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 module UsersHelper
   def remote_delete_user(user)
     return link_to(
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 10a4cba8..dd8c85f5 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,3 +1,4 @@
+# typed: strong
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 236a7249..457fc6b5 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -1,3 +1,4 @@
+# typed: true
 class Attachment < ApplicationRecord
   belongs_to :todo, touch: true
 
diff --git a/app/models/context.rb b/app/models/context.rb
index f9331fcb..b56a1b02 100644
--- a/app/models/context.rb
+++ b/app/models/context.rb
@@ -1,3 +1,4 @@
+# typed: false
 class Context < ApplicationRecord
 
   has_many :todos, -> { order(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")).includes(:project) }, :dependent => :delete_all
diff --git a/app/models/dependency.rb b/app/models/dependency.rb
index 3a89bd18..c51ce85f 100644
--- a/app/models/dependency.rb
+++ b/app/models/dependency.rb
@@ -1,3 +1,4 @@
+# typed: true
 class Dependency < ApplicationRecord
 
   # touch to make sure todo caches for predecessor and successor are invalidated
diff --git a/app/models/message_gateway.rb b/app/models/message_gateway.rb
index de60e8df..3df15a73 100644
--- a/app/models/message_gateway.rb
+++ b/app/models/message_gateway.rb
@@ -1,3 +1,4 @@
+# typed: false
 class MessageGateway < ActionMailer::Base
 
   def receive(email)
diff --git a/app/models/note.rb b/app/models/note.rb
index 5ba0750a..93606105 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,3 +1,4 @@
+# typed: strict
 class Note < ApplicationRecord
   belongs_to :user
   belongs_to :project
diff --git a/app/models/null_time.rb b/app/models/null_time.rb
index a4a019c8..4c14bd0f 100644
--- a/app/models/null_time.rb
+++ b/app/models/null_time.rb
@@ -1,3 +1,4 @@
+# typed: true
 class NullTime
   include Comparable
 
diff --git a/app/models/preference.rb b/app/models/preference.rb
index df5e7d18..2efe7ad5 100644
--- a/app/models/preference.rb
+++ b/app/models/preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class Preference < ApplicationRecord
   belongs_to :user
   belongs_to :sms_context, :class_name => 'Context'
diff --git a/app/models/project.rb b/app/models/project.rb
index d10594a9..36cbb1fe 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,3 +1,4 @@
+# typed: false
 class Project < ApplicationRecord
   has_many :todos, -> {order(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC"))}, dependent: :delete_all
   has_many :notes, -> {order "created_at DESC"}, dependent: :delete_all
diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb
index e9f09ff3..c3b84b52 100644
--- a/app/models/recurring_todo.rb
+++ b/app/models/recurring_todo.rb
@@ -1,3 +1,4 @@
+# typed: false
 class RecurringTodo < ApplicationRecord
   belongs_to :context
   belongs_to :project
diff --git a/app/models/recurring_todos/abstract_recurrence_pattern.rb b/app/models/recurring_todos/abstract_recurrence_pattern.rb
index d7a8baad..4a9e50b6 100644
--- a/app/models/recurring_todos/abstract_recurrence_pattern.rb
+++ b/app/models/recurring_todos/abstract_recurrence_pattern.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class AbstractRecurrencePattern
diff --git a/app/models/recurring_todos/abstract_recurring_todos_builder.rb b/app/models/recurring_todos/abstract_recurring_todos_builder.rb
index 5c367d14..3045a89f 100644
--- a/app/models/recurring_todos/abstract_recurring_todos_builder.rb
+++ b/app/models/recurring_todos/abstract_recurring_todos_builder.rb
@@ -1,3 +1,4 @@
+# typed: false
 module RecurringTodos
 
   class AbstractRecurringTodosBuilder
diff --git a/app/models/recurring_todos/daily_recurrence_pattern.rb b/app/models/recurring_todos/daily_recurrence_pattern.rb
index d6f0f3c2..e6134b56 100644
--- a/app/models/recurring_todos/daily_recurrence_pattern.rb
+++ b/app/models/recurring_todos/daily_recurrence_pattern.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class DailyRecurrencePattern < AbstractRecurrencePattern
diff --git a/app/models/recurring_todos/daily_recurring_todos_builder.rb b/app/models/recurring_todos/daily_recurring_todos_builder.rb
index 15a18512..8ca738e4 100644
--- a/app/models/recurring_todos/daily_recurring_todos_builder.rb
+++ b/app/models/recurring_todos/daily_recurring_todos_builder.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class DailyRecurringTodosBuilder < AbstractRecurringTodosBuilder
diff --git a/app/models/recurring_todos/monthly_recurrence_pattern.rb b/app/models/recurring_todos/monthly_recurrence_pattern.rb
index 6b49835d..577c18df 100644
--- a/app/models/recurring_todos/monthly_recurrence_pattern.rb
+++ b/app/models/recurring_todos/monthly_recurrence_pattern.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class MonthlyRecurrencePattern < AbstractRecurrencePattern
diff --git a/app/models/recurring_todos/monthly_recurring_todos_builder.rb b/app/models/recurring_todos/monthly_recurring_todos_builder.rb
index af12df0c..1af74e7d 100644
--- a/app/models/recurring_todos/monthly_recurring_todos_builder.rb
+++ b/app/models/recurring_todos/monthly_recurring_todos_builder.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class MonthlyRecurringTodosBuilder < AbstractRecurringTodosBuilder
diff --git a/app/models/recurring_todos/recurring_todos_builder.rb b/app/models/recurring_todos/recurring_todos_builder.rb
index 56bbcaf5..c2ed3cf6 100644
--- a/app/models/recurring_todos/recurring_todos_builder.rb
+++ b/app/models/recurring_todos/recurring_todos_builder.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class RecurringTodosBuilder
diff --git a/app/models/recurring_todos/weekly_recurrence_pattern.rb b/app/models/recurring_todos/weekly_recurrence_pattern.rb
index db1a834a..61494bc1 100644
--- a/app/models/recurring_todos/weekly_recurrence_pattern.rb
+++ b/app/models/recurring_todos/weekly_recurrence_pattern.rb
@@ -1,3 +1,4 @@
+# typed: false
 module RecurringTodos
 
   class WeeklyRecurrencePattern < AbstractRecurrencePattern
diff --git a/app/models/recurring_todos/weekly_recurring_todos_builder.rb b/app/models/recurring_todos/weekly_recurring_todos_builder.rb
index c23dc4b8..5fa9e49c 100644
--- a/app/models/recurring_todos/weekly_recurring_todos_builder.rb
+++ b/app/models/recurring_todos/weekly_recurring_todos_builder.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class WeeklyRecurringTodosBuilder < AbstractRecurringTodosBuilder
diff --git a/app/models/recurring_todos/yearly_recurrence_pattern.rb b/app/models/recurring_todos/yearly_recurrence_pattern.rb
index bafe66cc..81775158 100644
--- a/app/models/recurring_todos/yearly_recurrence_pattern.rb
+++ b/app/models/recurring_todos/yearly_recurrence_pattern.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class YearlyRecurrencePattern < AbstractRecurrencePattern
diff --git a/app/models/recurring_todos/yearly_recurring_todos_builder.rb b/app/models/recurring_todos/yearly_recurring_todos_builder.rb
index 94c3630c..ecbba4a6 100644
--- a/app/models/recurring_todos/yearly_recurring_todos_builder.rb
+++ b/app/models/recurring_todos/yearly_recurring_todos_builder.rb
@@ -1,3 +1,4 @@
+# typed: true
 module RecurringTodos
 
   class YearlyRecurringTodosBuilder < AbstractRecurringTodosBuilder
diff --git a/app/models/search/search_results.rb b/app/models/search/search_results.rb
index 36130db3..a3e627d6 100644
--- a/app/models/search/search_results.rb
+++ b/app/models/search/search_results.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Search
 
   class SearchResults
diff --git a/app/models/sidebar.rb b/app/models/sidebar.rb
index cf50e0c1..85b6faa3 100644
--- a/app/models/sidebar.rb
+++ b/app/models/sidebar.rb
@@ -1,3 +1,4 @@
+# typed: true
 class Sidebar
   attr_reader :contexts, :projects
 
diff --git a/app/models/stats/actions.rb b/app/models/stats/actions.rb
index 2d862d46..8f370350 100644
--- a/app/models/stats/actions.rb
+++ b/app/models/stats/actions.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class Actions
 
diff --git a/app/models/stats/chart.rb b/app/models/stats/chart.rb
index 66fc59a8..a1b68a21 100644
--- a/app/models/stats/chart.rb
+++ b/app/models/stats/chart.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
 
   class Chart
diff --git a/app/models/stats/contexts.rb b/app/models/stats/contexts.rb
index 488663ca..43d2118b 100644
--- a/app/models/stats/contexts.rb
+++ b/app/models/stats/contexts.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class Contexts
 
diff --git a/app/models/stats/projects.rb b/app/models/stats/projects.rb
index 9e2a14d6..2e0714ed 100644
--- a/app/models/stats/projects.rb
+++ b/app/models/stats/projects.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class Projects
 
diff --git a/app/models/stats/tag_cloud.rb b/app/models/stats/tag_cloud.rb
index 67865f27..ad430b43 100644
--- a/app/models/stats/tag_cloud.rb
+++ b/app/models/stats/tag_cloud.rb
@@ -1,3 +1,4 @@
+# typed: true
 # tag cloud code inspired by this article
 #  http://www.juixe.com/techknow/index.php/2006/07/15/acts-as-taggable-tag-cloud/
 module Stats
diff --git a/app/models/stats/tag_cloud_query.rb b/app/models/stats/tag_cloud_query.rb
index e754cc6c..ecab20a3 100644
--- a/app/models/stats/tag_cloud_query.rb
+++ b/app/models/stats/tag_cloud_query.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class TagCloudQuery
 
diff --git a/app/models/stats/time_to_complete.rb b/app/models/stats/time_to_complete.rb
index 3a146c13..1de0386b 100644
--- a/app/models/stats/time_to_complete.rb
+++ b/app/models/stats/time_to_complete.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class TimeToComplete
 
diff --git a/app/models/stats/top_contexts_query.rb b/app/models/stats/top_contexts_query.rb
index d47abfb1..616ede10 100644
--- a/app/models/stats/top_contexts_query.rb
+++ b/app/models/stats/top_contexts_query.rb
@@ -1,3 +1,4 @@
+# typed: true
 # Get action count for the top n contexts (default: all)
 # If initialized with :running => true, then only active
 # and visible contexts will be included.
diff --git a/app/models/stats/top_projects_query.rb b/app/models/stats/top_projects_query.rb
index 1ed70f44..42df1733 100644
--- a/app/models/stats/top_projects_query.rb
+++ b/app/models/stats/top_projects_query.rb
@@ -1,3 +1,4 @@
+# typed: true
 # Get the first 10 projects with their actions count of actions.
 # When a cutoff is passed in, only actions that have been created
 # or completed since that cutoff will be included.
diff --git a/app/models/stats/totals.rb b/app/models/stats/totals.rb
index 49104678..8f6b6483 100644
--- a/app/models/stats/totals.rb
+++ b/app/models/stats/totals.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class Totals
 
diff --git a/app/models/stats/user_stats.rb b/app/models/stats/user_stats.rb
index 6aaf52af..03ea1f66 100644
--- a/app/models/stats/user_stats.rb
+++ b/app/models/stats/user_stats.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class UserStats
 
diff --git a/app/models/stats/user_tags_query.rb b/app/models/stats/user_tags_query.rb
index 034e5adb..35e25605 100644
--- a/app/models/stats/user_tags_query.rb
+++ b/app/models/stats/user_tags_query.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Stats
   class UserTagsQuery
 
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 2c710dad..bed7e8f9 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,3 +1,4 @@
+# typed: false
 class Tag < ApplicationRecord
 
   has_many :taggings
diff --git a/app/models/tagging.rb b/app/models/tagging.rb
index a89d1e10..f535be3e 100644
--- a/app/models/tagging.rb
+++ b/app/models/tagging.rb
@@ -1,3 +1,4 @@
+# typed: true
 
 # The Tagging join model.
 
diff --git a/app/models/todo.rb b/app/models/todo.rb
index c69bb69c..bbcce8a2 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -1,3 +1,4 @@
+# typed: false
 class Todo < ApplicationRecord
 
   MAX_DESCRIPTION_LENGTH = 300
diff --git a/app/models/todos/calendar.rb b/app/models/todos/calendar.rb
index d208f660..9e394e11 100644
--- a/app/models/todos/calendar.rb
+++ b/app/models/todos/calendar.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Todos
   class Calendar
 
diff --git a/app/models/todos/undone_todos_query.rb b/app/models/todos/undone_todos_query.rb
index c6d107ab..69709448 100644
--- a/app/models/todos/undone_todos_query.rb
+++ b/app/models/todos/undone_todos_query.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Todos
   class UndoneTodosQuery
     include ActionView::Helpers::SanitizeHelper
diff --git a/app/models/user.rb b/app/models/user.rb
index 736db95e..4f71c309 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'digest/sha1'
 require 'bcrypt'
 
diff --git a/app/services/rich_message_extractor.rb b/app/services/rich_message_extractor.rb
index 9b19a855..65b7e4b5 100644
--- a/app/services/rich_message_extractor.rb
+++ b/app/services/rich_message_extractor.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'date'
 class RichMessageExtractor
   include ActionView::Helpers::SanitizeHelper
diff --git a/app/services/todo_from_rich_message.rb b/app/services/todo_from_rich_message.rb
index bf567797..7e12bacf 100644
--- a/app/services/todo_from_rich_message.rb
+++ b/app/services/todo_from_rich_message.rb
@@ -1,3 +1,4 @@
+# typed: false
 class TodoFromRichMessage
 
   attr_reader :user, :default_context_id, :description, :notes
diff --git a/config/application.rb b/config/application.rb
index 9d8c9e82..3ed7d636 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,4 @@
+# typed: false
 require_relative 'boot'
 
 require 'rails/all'
diff --git a/config/boot.rb b/config/boot.rb
index 30f5120d..b54e87e1 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,4 @@
+# typed: strong
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index 426333bb..a4d48359 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,3 +1,4 @@
+# typed: strict
 # Load the Rails application.
 require_relative 'application'
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1311e3e4..aa07688b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,3 +1,4 @@
+# typed: false
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index bf31e9c4..1d887335 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +1,4 @@
+# typed: false
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 0a38fd3c..fd3ba849 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,4 @@
+# typed: false
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
index 89d2efab..17890fa9 100644
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index fdadc96a..349f573d 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 59385cdf..ed7740ed 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/bullet.rb b/config/initializers/bullet.rb
index c8788e16..90a7ca4e 100644
--- a/config/initializers/bullet.rb
+++ b/config/initializers/bullet.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # config for bullet gem
 
 if defined? Bullet
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index d3bcaa5e..a80e9be9 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide content security policy
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index f51a497e..fe119221 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Be sure to restart your server when you modify this file.
 
 # Specify a serializer for the signed and encrypted cookie jars.
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 4a994e1e..7303cfae 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
diff --git a/config/initializers/i18n-config.rb b/config/initializers/i18n-config.rb
index a951eeac..21da9764 100644
--- a/config/initializers/i18n-config.rb
+++ b/config/initializers/i18n-config.rb
@@ -1,3 +1,4 @@
+# typed: false
 module I18n::Backend::Pluralization
   # rules taken from : http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html
   def pluralize(locale, entry, n)
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index ac033bf9..1d312a2d 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index f3db7c92..893c8850 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,3 +1,4 @@
+# typed: strict
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
index a2bfed30..f50d3d88 100644
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 5.0 upgrade.
diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/new_framework_defaults_5_1.rb
index 9010abd5..d2651cc7 100644
--- a/config/initializers/new_framework_defaults_5_1.rb
+++ b/config/initializers/new_framework_defaults_5_1.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 5.1 upgrade.
diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb
index c383d072..9acf2d23 100644
--- a/config/initializers/new_framework_defaults_5_2.rb
+++ b/config/initializers/new_framework_defaults_5_2.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 5.2 upgrade.
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 11e77531..0ce3c60c 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -1,3 +1,4 @@
+# typed: true
 #config/initilizers/paperclip.rb
 require 'paperclip/media_type_spoof_detector'
 
diff --git a/config/initializers/rack-mini-profiler.rb b/config/initializers/rack-mini-profiler.rb
index 9103b7e8..a7637cf9 100644
--- a/config/initializers/rack-mini-profiler.rb
+++ b/config/initializers/rack-mini-profiler.rb
@@ -1,2 +1,3 @@
+# typed: strict
 # Have Mini Profiler show up on the right
 Rack::MiniProfiler.config.position = 'bottom-left' if defined?(Rack::MiniProfiler) 
diff --git a/config/initializers/sanitizer.rb b/config/initializers/sanitizer.rb
index 6d99f404..d4b45502 100644
--- a/config/initializers/sanitizer.rb
+++ b/config/initializers/sanitizer.rb
@@ -1 +1,2 @@
+# typed: strict
 Loofah::HTML5::WhiteList::ALLOWED_PROTOCOLS.merge(%w(message onenote))
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index dff12be6..7fb4e754 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_tracksapp_session'
diff --git a/config/initializers/tolk.rb b/config/initializers/tolk.rb
index 5c3fa780..f880a6d9 100644
--- a/config/initializers/tolk.rb
+++ b/config/initializers/tolk.rb
@@ -1,3 +1,4 @@
+# typed: strict
 # encoding: utf-8
 
 # Tolk config file. Generated on July 18, 2012 13:01
diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb
index 488b797f..c08c8118 100644
--- a/config/initializers/tracks.rb
+++ b/config/initializers/tracks.rb
@@ -1,3 +1,4 @@
+# typed: true
 tracks_version='2.4.1'
 # comment out next two lines if you do not want (or can not) the date of the
 # last git commit in the footer
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index bbfc3961..e47cfdd1 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,3 +1,4 @@
+# typed: strict
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which
diff --git a/config/puma.rb b/config/puma.rb
index a5eccf81..98d6f86a 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
diff --git a/config/routes.rb b/config/routes.rb
index c35f7991..440e45b3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,4 @@
+# typed: strict
 Rails.application.routes.draw do
   mount Tolk::Engine => '/tolk', :as => 'tolk' if Rails.env=='development'
 
diff --git a/config/spring.rb b/config/spring.rb
index c9119b40..8df288be 100644
--- a/config/spring.rb
+++ b/config/spring.rb
@@ -1,3 +1,4 @@
+# typed: false
 %w(
   .ruby-version
   .rbenv-vars
diff --git a/db/migrate/001_create_tracks_db.rb b/db/migrate/001_create_tracks_db.rb
index 3cc9373b..18313466 100644
--- a/db/migrate/001_create_tracks_db.rb
+++ b/db/migrate/001_create_tracks_db.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Verision 1.0.3 database
 class CreateTracksDb < ActiveRecord::Migration[5.2]
   def self.up
diff --git a/db/migrate/002_add_user_id.rb b/db/migrate/002_add_user_id.rb
index 6e42504f..489317ee 100644
--- a/db/migrate/002_add_user_id.rb
+++ b/db/migrate/002_add_user_id.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddUserId < ActiveRecord::Migration[5.2]
   
   class Project < ActiveRecord::Base; end
diff --git a/db/migrate/003_created_at.rb b/db/migrate/003_created_at.rb
index f3083b2e..158862dd 100644
--- a/db/migrate/003_created_at.rb
+++ b/db/migrate/003_created_at.rb
@@ -1,3 +1,4 @@
+# typed: false
 class CreatedAt < ActiveRecord::Migration[5.2]
   # Current bug in Rails that prevents rename_column working in SQLite
   # if the column names use symbols instead of strings.
diff --git a/db/migrate/004_notes.rb b/db/migrate/004_notes.rb
index 89745617..8380e85b 100644
--- a/db/migrate/004_notes.rb
+++ b/db/migrate/004_notes.rb
@@ -1,3 +1,4 @@
+# typed: false
 class Notes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :notes do |t|
diff --git a/db/migrate/005_add_project_description.rb b/db/migrate/005_add_project_description.rb
index 9f682e4e..06640c7f 100644
--- a/db/migrate/005_add_project_description.rb
+++ b/db/migrate/005_add_project_description.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddProjectDescription < ActiveRecord::Migration[5.2]
   def self.up
     add_column :projects, :description, :text
diff --git a/db/migrate/006_add_preferences_to_user_table.rb b/db/migrate/006_add_preferences_to_user_table.rb
index c7a9c1e4..7d218bf4 100644
--- a/db/migrate/006_add_preferences_to_user_table.rb
+++ b/db/migrate/006_add_preferences_to_user_table.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddPreferencesToUserTable < ActiveRecord::Migration[5.2]
   
   class User < ActiveRecord::Base; end
diff --git a/db/migrate/007_add_sessions_table.rb b/db/migrate/007_add_sessions_table.rb
index e8066417..a2ff7ad8 100644
--- a/db/migrate/007_add_sessions_table.rb
+++ b/db/migrate/007_add_sessions_table.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddSessionsTable < ActiveRecord::Migration[5.2]
   def self.up
     create_table :sessions do |t|
diff --git a/db/migrate/008_add_subclass_attr_to_todos.rb b/db/migrate/008_add_subclass_attr_to_todos.rb
index 4818a595..8c7023aa 100644
--- a/db/migrate/008_add_subclass_attr_to_todos.rb
+++ b/db/migrate/008_add_subclass_attr_to_todos.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddSubclassAttrToTodos < ActiveRecord::Migration[5.2]
 
   class Todo < ActiveRecord::Base; end
diff --git a/db/migrate/009_add_user_pref_refresh.rb b/db/migrate/009_add_user_pref_refresh.rb
index 9219ebf6..58178fe8 100644
--- a/db/migrate/009_add_user_pref_refresh.rb
+++ b/db/migrate/009_add_user_pref_refresh.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddUserPrefRefresh < ActiveRecord::Migration[5.2]
   
   class User < ActiveRecord::Base; serialize :preferences; end
diff --git a/db/migrate/010_add_first_and_last_name_to_user.rb b/db/migrate/010_add_first_and_last_name_to_user.rb
index b2a6dbd1..287f1a14 100644
--- a/db/migrate/010_add_first_and_last_name_to_user.rb
+++ b/db/migrate/010_add_first_and_last_name_to_user.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddFirstAndLastNameToUser < ActiveRecord::Migration[5.2]
   def self.up
     add_column :users, :first_name, :string
diff --git a/db/migrate/011_pref_to_show_hide_sidebar_items.rb b/db/migrate/011_pref_to_show_hide_sidebar_items.rb
index f237de2b..5da5e425 100644
--- a/db/migrate/011_pref_to_show_hide_sidebar_items.rb
+++ b/db/migrate/011_pref_to_show_hide_sidebar_items.rb
@@ -1,3 +1,4 @@
+# typed: false
 class PrefToShowHideSidebarItems < ActiveRecord::Migration[5.2]
 
   class User < ActiveRecord::Base; serialize :preferences; end
diff --git a/db/migrate/012_add_preferences_model.rb b/db/migrate/012_add_preferences_model.rb
index 95ab91d4..89fd2455 100644
--- a/db/migrate/012_add_preferences_model.rb
+++ b/db/migrate/012_add_preferences_model.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddPreferencesModel < ActiveRecord::Migration[5.2]
 
   class User < ActiveRecord::Base; serialize :preferences; end
diff --git a/db/migrate/013_convert_preferences.rb b/db/migrate/013_convert_preferences.rb
index 396f7aed..2632b712 100644
--- a/db/migrate/013_convert_preferences.rb
+++ b/db/migrate/013_convert_preferences.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ConvertPreferences < ActiveRecord::Migration[5.2]
 
   class User < ActiveRecord::Base; has_one :preference; serialize :preferences; end
diff --git a/db/migrate/014_convert_project_to_state_machine.rb b/db/migrate/014_convert_project_to_state_machine.rb
index 049c7560..054939d2 100644
--- a/db/migrate/014_convert_project_to_state_machine.rb
+++ b/db/migrate/014_convert_project_to_state_machine.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ConvertProjectToStateMachine < ActiveRecord::Migration[5.2]
 
   class Project < ActiveRecord::Base; end
diff --git a/db/migrate/015_add_verbose_action_descriptors_preference.rb b/db/migrate/015_add_verbose_action_descriptors_preference.rb
index e0b9a280..a7c99eb5 100644
--- a/db/migrate/015_add_verbose_action_descriptors_preference.rb
+++ b/db/migrate/015_add_verbose_action_descriptors_preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddVerboseActionDescriptorsPreference < ActiveRecord::Migration[5.2]
   def self.up
     add_column :preferences, :verbose_action_descriptors, :boolean, :default => false, :null => false
diff --git a/db/migrate/016_add_user_auth_type.rb b/db/migrate/016_add_user_auth_type.rb
index 0fd26459..32bbbfbd 100644
--- a/db/migrate/016_add_user_auth_type.rb
+++ b/db/migrate/016_add_user_auth_type.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddUserAuthType < ActiveRecord::Migration[5.2]
   def self.up
     add_column :users, :auth_type, :string, :default => 'database', :null => false
diff --git a/db/migrate/017_add_open_id_tables.rb b/db/migrate/017_add_open_id_tables.rb
index 6d99fc26..d7307c32 100644
--- a/db/migrate/017_add_open_id_tables.rb
+++ b/db/migrate/017_add_open_id_tables.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
diff --git a/db/migrate/018_add_user_open_id_url.rb b/db/migrate/018_add_user_open_id_url.rb
index 3324a68a..7bd9037d 100644
--- a/db/migrate/018_add_user_open_id_url.rb
+++ b/db/migrate/018_add_user_open_id_url.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddUserOpenIdUrl < ActiveRecord::Migration[5.2]
   def self.up
     add_column :users, :open_id_url, :string
diff --git a/db/migrate/019_convert_todo_to_state_machine.rb b/db/migrate/019_convert_todo_to_state_machine.rb
index 8b9ba84a..336153f6 100644
--- a/db/migrate/019_convert_todo_to_state_machine.rb
+++ b/db/migrate/019_convert_todo_to_state_machine.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ConvertTodoToStateMachine < ActiveRecord::Migration[5.2]
 
   class Todo < ActiveRecord::Base; belongs_to :project; end
diff --git a/db/migrate/020_pref_to_show_hidden_projects_in_sidebar.rb b/db/migrate/020_pref_to_show_hidden_projects_in_sidebar.rb
index e1b07ced..1ca56187 100644
--- a/db/migrate/020_pref_to_show_hidden_projects_in_sidebar.rb
+++ b/db/migrate/020_pref_to_show_hidden_projects_in_sidebar.rb
@@ -1,3 +1,4 @@
+# typed: false
 class PrefToShowHiddenProjectsInSidebar < ActiveRecord::Migration[5.2]
 
   def self.up
diff --git a/db/migrate/021_add_time_zone_preference.rb b/db/migrate/021_add_time_zone_preference.rb
index 66596573..aaf91c4c 100644
--- a/db/migrate/021_add_time_zone_preference.rb
+++ b/db/migrate/021_add_time_zone_preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddTimeZonePreference < ActiveRecord::Migration[5.2]
 
   def self.up
diff --git a/db/migrate/022_add_indices.rb b/db/migrate/022_add_indices.rb
index 294d59ab..6e0424f0 100644
--- a/db/migrate/022_add_indices.rb
+++ b/db/migrate/022_add_indices.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddIndices < ActiveRecord::Migration[5.2]
   def self.up
     add_index :todos, [:user_id, :state]
diff --git a/db/migrate/023_index_on_user_login.rb b/db/migrate/023_index_on_user_login.rb
index 129627b2..43cf9459 100644
--- a/db/migrate/023_index_on_user_login.rb
+++ b/db/migrate/023_index_on_user_login.rb
@@ -1,3 +1,4 @@
+# typed: false
 class IndexOnUserLogin < ActiveRecord::Migration[5.2]
   def self.up
     add_index :users, :login
diff --git a/db/migrate/024_add_find_by_name_indices.rb b/db/migrate/024_add_find_by_name_indices.rb
index 0b88f603..418fdb63 100644
--- a/db/migrate/024_add_find_by_name_indices.rb
+++ b/db/migrate/024_add_find_by_name_indices.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddFindByNameIndices < ActiveRecord::Migration[5.2]
   def self.up
     add_index :projects, [:user_id, :name]
diff --git a/db/migrate/025_add_tag_support.rb b/db/migrate/025_add_tag_support.rb
index 34046a6c..57d62e2c 100644
--- a/db/migrate/025_add_tag_support.rb
+++ b/db/migrate/025_add_tag_support.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddTagSupport < ActiveRecord::Migration[5.2]
   def self.up
     create_table :taggings do |t| 
diff --git a/db/migrate/026_add_project_timestamps.rb b/db/migrate/026_add_project_timestamps.rb
index 6c92855a..296ac100 100644
--- a/db/migrate/026_add_project_timestamps.rb
+++ b/db/migrate/026_add_project_timestamps.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddProjectTimestamps < ActiveRecord::Migration[5.2]
   def self.up
     add_column :projects, :created_at, :timestamp
diff --git a/db/migrate/027_add_context_timestamps.rb b/db/migrate/027_add_context_timestamps.rb
index 99a077c7..4fd79eb7 100644
--- a/db/migrate/027_add_context_timestamps.rb
+++ b/db/migrate/027_add_context_timestamps.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddContextTimestamps < ActiveRecord::Migration[5.2]
 
   def self.up
diff --git a/db/migrate/028_add_show_project_on_todo_done_preference.rb b/db/migrate/028_add_show_project_on_todo_done_preference.rb
index 75cacc44..b17784f6 100644
--- a/db/migrate/028_add_show_project_on_todo_done_preference.rb
+++ b/db/migrate/028_add_show_project_on_todo_done_preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddShowProjectOnTodoDonePreference < ActiveRecord::Migration[5.2]
   def self.up
       add_column :preferences, :show_project_on_todo_done, :boolean, :default => false, :null => false
diff --git a/db/migrate/029_add_title_date_format_preference.rb b/db/migrate/029_add_title_date_format_preference.rb
index 99841bc2..1adbe2fa 100644
--- a/db/migrate/029_add_title_date_format_preference.rb
+++ b/db/migrate/029_add_title_date_format_preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddTitleDateFormatPreference < ActiveRecord::Migration[5.2]
     def self.up
       add_column :preferences, :title_date_format, :string, :limit => 255, :default => '%A, %d %B %Y', :null => false
diff --git a/db/migrate/030_set_nil_timestamps.rb b/db/migrate/030_set_nil_timestamps.rb
index 6fa0de1f..f03f78e3 100644
--- a/db/migrate/030_set_nil_timestamps.rb
+++ b/db/migrate/030_set_nil_timestamps.rb
@@ -1,3 +1,4 @@
+# typed: true
 class SetNilTimestamps < ActiveRecord::Migration[5.2]
 
   class Project < ActiveRecord::Base; end
diff --git a/db/migrate/031_add_default_context_to_project.rb b/db/migrate/031_add_default_context_to_project.rb
index 55896a7b..b9437e9f 100644
--- a/db/migrate/031_add_default_context_to_project.rb
+++ b/db/migrate/031_add_default_context_to_project.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddDefaultContextToProject < ActiveRecord::Migration[5.2]
   def self.up
      add_column :projects, :default_context_id, :integer
diff --git a/db/migrate/032_add_mobile_todos_per_page_preference.rb b/db/migrate/032_add_mobile_todos_per_page_preference.rb
index d4e5a33e..f1930eb8 100644
--- a/db/migrate/032_add_mobile_todos_per_page_preference.rb
+++ b/db/migrate/032_add_mobile_todos_per_page_preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddMobileTodosPerPagePreference < ActiveRecord::Migration[5.2]
     def self.up
       add_column :preferences, :mobile_todos_per_page, :integer, :null => false, :default => 6
diff --git a/db/migrate/033_add_remember_me_to_user.rb b/db/migrate/033_add_remember_me_to_user.rb
index 59912330..15c47aaa 100644
--- a/db/migrate/033_add_remember_me_to_user.rb
+++ b/db/migrate/033_add_remember_me_to_user.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddRememberMeToUser < ActiveRecord::Migration[5.2]
   def self.up
     rename_column :users, 'password', 'crypted_password' #bug in sqlite requires column names as strings
diff --git a/db/migrate/034_rename_word_to_token.rb b/db/migrate/034_rename_word_to_token.rb
index 2be9f64d..935d7c5b 100644
--- a/db/migrate/034_rename_word_to_token.rb
+++ b/db/migrate/034_rename_word_to_token.rb
@@ -1,3 +1,4 @@
+# typed: false
 class RenameWordToToken < ActiveRecord::Migration[5.2]
   def self.up
     rename_column :users, 'word', 'token' #bug in sqlite requires column names as strings
diff --git a/db/migrate/035_update_open_id_urls.rb b/db/migrate/035_update_open_id_urls.rb
index 152eae19..504cf54e 100644
--- a/db/migrate/035_update_open_id_urls.rb
+++ b/db/migrate/035_update_open_id_urls.rb
@@ -1,3 +1,4 @@
+# typed: false
 class UpdateOpenIdUrls < ActiveRecord::Migration[5.2]
 
   class User < ActiveRecord::Base
diff --git a/db/migrate/036_add_project_completed_at_column.rb b/db/migrate/036_add_project_completed_at_column.rb
index f8d1fe35..e65f4db8 100644
--- a/db/migrate/036_add_project_completed_at_column.rb
+++ b/db/migrate/036_add_project_completed_at_column.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddProjectCompletedAtColumn < ActiveRecord::Migration[5.2]
 
   class Project < ActiveRecord::Base; end
diff --git a/db/migrate/037_add_index_to_notes.rb b/db/migrate/037_add_index_to_notes.rb
index de837196..b5e43633 100644
--- a/db/migrate/037_add_index_to_notes.rb
+++ b/db/migrate/037_add_index_to_notes.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddIndexToNotes < ActiveRecord::Migration[5.2]
   def self.up
     add_index :notes, [:project_id]
diff --git a/db/migrate/038_projects_contexts_remove_not_null_from_position.rb b/db/migrate/038_projects_contexts_remove_not_null_from_position.rb
index af167857..81c85ac4 100644
--- a/db/migrate/038_projects_contexts_remove_not_null_from_position.rb
+++ b/db/migrate/038_projects_contexts_remove_not_null_from_position.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ProjectsContextsRemoveNotNullFromPosition < ActiveRecord::Migration[5.2]
   def self.up
     change_column :projects, :position, :integer, {:null => true, :default => nil}
diff --git a/db/migrate/039_create_recurring_todos.rb b/db/migrate/039_create_recurring_todos.rb
index 36739ace..4fd8fc99 100644
--- a/db/migrate/039_create_recurring_todos.rb
+++ b/db/migrate/039_create_recurring_todos.rb
@@ -1,3 +1,4 @@
+# typed: false
 class CreateRecurringTodos < ActiveRecord::Migration[5.2]
   def self.up
     create_table :recurring_todos do |t|
diff --git a/db/migrate/040_add_several_indexes.rb b/db/migrate/040_add_several_indexes.rb
index f8f8f590..8344d039 100644
--- a/db/migrate/040_add_several_indexes.rb
+++ b/db/migrate/040_add_several_indexes.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddSeveralIndexes < ActiveRecord::Migration[5.2]
   def self.up
     add_index :taggings, [:taggable_id, :taggable_type]
diff --git a/db/migrate/041_add_sms_to_preference.rb b/db/migrate/041_add_sms_to_preference.rb
index 6d47247b..3b877ce1 100644
--- a/db/migrate/041_add_sms_to_preference.rb
+++ b/db/migrate/041_add_sms_to_preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddSmsToPreference < ActiveRecord::Migration[5.2]
   def self.up
     add_column :preferences, :sms_email, :string
diff --git a/db/migrate/042_change_dates_to_datetimes.rb b/db/migrate/042_change_dates_to_datetimes.rb
index 511df942..f3c7bb60 100644
--- a/db/migrate/042_change_dates_to_datetimes.rb
+++ b/db/migrate/042_change_dates_to_datetimes.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ChangeDatesToDatetimes < ActiveRecord::Migration[5.2]
   def self.up
     change_column :todos, :show_from, :datetime
diff --git a/db/migrate/043_add_updated_at_to_todos.rb b/db/migrate/043_add_updated_at_to_todos.rb
index fae126db..e6412a8d 100644
--- a/db/migrate/043_add_updated_at_to_todos.rb
+++ b/db/migrate/043_add_updated_at_to_todos.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddUpdatedAtToTodos < ActiveRecord::Migration[5.2]
   def self.up
       add_column :todos, :updated_at, :timestamp
diff --git a/db/migrate/044_upgrade_open_id.rb b/db/migrate/044_upgrade_open_id.rb
index cbe79064..99aa9d38 100644
--- a/db/migrate/044_upgrade_open_id.rb
+++ b/db/migrate/044_upgrade_open_id.rb
@@ -1,3 +1,4 @@
+# typed: false
 class UpgradeOpenId < ActiveRecord::Migration[5.2]
   def self.up
     create_table :open_id_authentication_associations, :force => true do |t|
diff --git a/db/migrate/045_remove_user_from_taggings.rb b/db/migrate/045_remove_user_from_taggings.rb
index b2dcf1f9..09b27e32 100644
--- a/db/migrate/045_remove_user_from_taggings.rb
+++ b/db/migrate/045_remove_user_from_taggings.rb
@@ -1,3 +1,4 @@
+# typed: false
 class RemoveUserFromTaggings < ActiveRecord::Migration[5.2]
   def self.up
     remove_index :taggings, [:tag_id, :taggable_id, :taggable_type]
diff --git a/db/migrate/046_fix_incorrectly_hidden_todos.rb b/db/migrate/046_fix_incorrectly_hidden_todos.rb
index 10276869..f47a7c2d 100644
--- a/db/migrate/046_fix_incorrectly_hidden_todos.rb
+++ b/db/migrate/046_fix_incorrectly_hidden_todos.rb
@@ -1,3 +1,4 @@
+# typed: true
 class FixIncorrectlyHiddenTodos < ActiveRecord::Migration[5.2]
   def self.up
     hidden_todos_without_project =
diff --git a/db/migrate/20090301154745_add_default_tags_to_project.rb b/db/migrate/20090301154745_add_default_tags_to_project.rb
index 382b11a9..75184261 100644
--- a/db/migrate/20090301154745_add_default_tags_to_project.rb
+++ b/db/migrate/20090301154745_add_default_tags_to_project.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddDefaultTagsToProject < ActiveRecord::Migration[5.2]
   def self.up
     add_column :projects, :default_tags, :string
diff --git a/db/migrate/20090516000646_add_todo_dependencies.rb b/db/migrate/20090516000646_add_todo_dependencies.rb
index 8344fb70..8280979c 100644
--- a/db/migrate/20090516000646_add_todo_dependencies.rb
+++ b/db/migrate/20090516000646_add_todo_dependencies.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddTodoDependencies < ActiveRecord::Migration[5.2]
   def self.up
     create_table :dependencies do |t|
diff --git a/db/migrate/20090531111711_add_show_always_to_recurring_todo.rb b/db/migrate/20090531111711_add_show_always_to_recurring_todo.rb
index 3ac5990a..4ad3f638 100644
--- a/db/migrate/20090531111711_add_show_always_to_recurring_todo.rb
+++ b/db/migrate/20090531111711_add_show_always_to_recurring_todo.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddShowAlwaysToRecurringTodo < ActiveRecord::Migration[5.2]
   def self.up
     add_column :recurring_todos, :show_always, :boolean
diff --git a/db/migrate/20100502162317_add_index_to_todo_state.rb b/db/migrate/20100502162317_add_index_to_todo_state.rb
index e95b3510..e1e92ffd 100644
--- a/db/migrate/20100502162317_add_index_to_todo_state.rb
+++ b/db/migrate/20100502162317_add_index_to_todo_state.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddIndexToTodoState < ActiveRecord::Migration[5.2]
   def self.up
     add_index :todos, :state
diff --git a/db/migrate/20110104200112_add_locale_to_preference.rb b/db/migrate/20110104200112_add_locale_to_preference.rb
index ad35ca5e..b7099066 100644
--- a/db/migrate/20110104200112_add_locale_to_preference.rb
+++ b/db/migrate/20110104200112_add_locale_to_preference.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddLocaleToPreference < ActiveRecord::Migration[5.2]
   def self.up
     add_column :preferences, :locale, :string
diff --git a/db/migrate/20110526192008_adapt_to_new_aasm.rb b/db/migrate/20110526192008_adapt_to_new_aasm.rb
index 6e3dcb28..65edac98 100644
--- a/db/migrate/20110526192008_adapt_to_new_aasm.rb
+++ b/db/migrate/20110526192008_adapt_to_new_aasm.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AdaptToNewAasm < ActiveRecord::Migration[5.2]
   def self.up
     change_column_default :todos, :state, nil
diff --git a/db/migrate/20110621082432_make_old_recurring_todos_validate.rb b/db/migrate/20110621082432_make_old_recurring_todos_validate.rb
index 8b4ca082..fc6cb359 100644
--- a/db/migrate/20110621082432_make_old_recurring_todos_validate.rb
+++ b/db/migrate/20110621082432_make_old_recurring_todos_validate.rb
@@ -1,3 +1,4 @@
+# typed: false
 class MakeOldRecurringTodosValidate < ActiveRecord::Migration[5.2]
   def self.up
     RecurringTodo.all.each do |rt|
diff --git a/db/migrate/20110727073510_change_crypted_password_length.rb b/db/migrate/20110727073510_change_crypted_password_length.rb
index 63f2a5b6..57c584b1 100644
--- a/db/migrate/20110727073510_change_crypted_password_length.rb
+++ b/db/migrate/20110727073510_change_crypted_password_length.rb
@@ -1,3 +1,4 @@
+# typed: false
 class ChangeCryptedPasswordLength < ActiveRecord::Migration[5.2]
   def self.up
     change_column 'users', 'crypted_password', :string, :limit => 60
diff --git a/db/migrate/20110915100000_add_last_reviewed_to_project.rb b/db/migrate/20110915100000_add_last_reviewed_to_project.rb
index f72142a0..ad19dcd6 100644
--- a/db/migrate/20110915100000_add_last_reviewed_to_project.rb
+++ b/db/migrate/20110915100000_add_last_reviewed_to_project.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddLastReviewedToProject < ActiveRecord::Migration[5.2]
 
   def self.up
diff --git a/db/migrate/20110915100001_add_next_review_preferences.rb b/db/migrate/20110915100001_add_next_review_preferences.rb
index cc91779a..de64122a 100644
--- a/db/migrate/20110915100001_add_next_review_preferences.rb
+++ b/db/migrate/20110915100001_add_next_review_preferences.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddNextReviewPreferences < ActiveRecord::Migration[5.2]
 
   def self.up
diff --git a/db/migrate/20120409105058_add_indices_to_dependency_table.rb b/db/migrate/20120409105058_add_indices_to_dependency_table.rb
index bad95d08..27db541a 100644
--- a/db/migrate/20120409105058_add_indices_to_dependency_table.rb
+++ b/db/migrate/20120409105058_add_indices_to_dependency_table.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddIndicesToDependencyTable < ActiveRecord::Migration[5.2]
   def self.up
     add_index :dependencies, :successor_id
diff --git a/db/migrate/20120412072508_add_rendered_notes.rb b/db/migrate/20120412072508_add_rendered_notes.rb
index 957fbe3a..66ef9355 100644
--- a/db/migrate/20120412072508_add_rendered_notes.rb
+++ b/db/migrate/20120412072508_add_rendered_notes.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddRenderedNotes < ActiveRecord::Migration[5.2]
   def self.up
     add_column :todos, 'rendered_notes', :text
diff --git a/db/migrate/20120718110127_create_tolk_tables.rb b/db/migrate/20120718110127_create_tolk_tables.rb
index 0397f3cd..fcf2c88e 100644
--- a/db/migrate/20120718110127_create_tolk_tables.rb
+++ b/db/migrate/20120718110127_create_tolk_tables.rb
@@ -1,3 +1,4 @@
+# typed: false
 class CreateTolkTables < ActiveRecord::Migration[5.2]
   def self.up
     create_table :tolk_locales do |t|
diff --git a/db/migrate/20121223144702_no_default_admin_email.rb b/db/migrate/20121223144702_no_default_admin_email.rb
index 8b6f6d3b..f8fffdc5 100644
--- a/db/migrate/20121223144702_no_default_admin_email.rb
+++ b/db/migrate/20121223144702_no_default_admin_email.rb
@@ -1,3 +1,4 @@
+# typed: true
 class NoDefaultAdminEmail < ActiveRecord::Migration[5.2]
   def up
     remove_column :preferences, :admin_email
diff --git a/db/migrate/20130227205845_add_state_to_context.rb b/db/migrate/20130227205845_add_state_to_context.rb
index 915aa056..2ebbfe2f 100644
--- a/db/migrate/20130227205845_add_state_to_context.rb
+++ b/db/migrate/20130227205845_add_state_to_context.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddStateToContext < ActiveRecord::Migration[5.2]
 
   class Context < ActiveRecord::Base
diff --git a/db/migrate/20150209233951_rename_occurences_to_occurrences.rb b/db/migrate/20150209233951_rename_occurences_to_occurrences.rb
index f265eede..00e9ab8d 100644
--- a/db/migrate/20150209233951_rename_occurences_to_occurrences.rb
+++ b/db/migrate/20150209233951_rename_occurences_to_occurrences.rb
@@ -1,3 +1,4 @@
+# typed: true
 class RenameOccurencesToOccurrences < ActiveRecord::Migration[5.2]
   def change
     rename_column :recurring_todos, :number_of_occurences, :number_of_occurrences
diff --git a/db/migrate/20150413194512_remove_rendered_notes.rb b/db/migrate/20150413194512_remove_rendered_notes.rb
index 621d3c9c..58380789 100644
--- a/db/migrate/20150413194512_remove_rendered_notes.rb
+++ b/db/migrate/20150413194512_remove_rendered_notes.rb
@@ -1,3 +1,4 @@
+# typed: false
 class RemoveRenderedNotes < ActiveRecord::Migration[5.2]
   def self.up
     remove_column :todos, 'rendered_notes'
diff --git a/db/migrate/20150805144100_create_attachments.rb b/db/migrate/20150805144100_create_attachments.rb
index 21040cb7..b746f06a 100644
--- a/db/migrate/20150805144100_create_attachments.rb
+++ b/db/migrate/20150805144100_create_attachments.rb
@@ -1,3 +1,4 @@
+# typed: true
 class CreateAttachments < ActiveRecord::Migration[5.2]
   def change
     create_table :attachments do |t|
diff --git a/db/migrate/20160131233303_remove_project_hidden_state_from_todos.rb b/db/migrate/20160131233303_remove_project_hidden_state_from_todos.rb
index 710524db..45890ad9 100644
--- a/db/migrate/20160131233303_remove_project_hidden_state_from_todos.rb
+++ b/db/migrate/20160131233303_remove_project_hidden_state_from_todos.rb
@@ -1,3 +1,4 @@
+# typed: false
 class RemoveProjectHiddenStateFromTodos < ActiveRecord::Migration[5.2]
   class Todo < ActiveRecord::Base
     has_many :successor_dependencies, :foreign_key => 'successor_id', :class_name => 'Dependency'
diff --git a/db/migrate/20190618202817_add_user_id_to_tag.rb b/db/migrate/20190618202817_add_user_id_to_tag.rb
index 8a6e0ca9..1db0d1f0 100644
--- a/db/migrate/20190618202817_add_user_id_to_tag.rb
+++ b/db/migrate/20190618202817_add_user_id_to_tag.rb
@@ -1,3 +1,4 @@
+# typed: false
 class AddUserIdToTag < ActiveRecord::Migration[5.2]
   def self.up
     add_column :tags, :user_id, :integer
diff --git a/db/schema.rb b/db/schema.rb
index d961d407..e396c544 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
diff --git a/db/seeds.rb b/db/seeds.rb
index 4edb1e85..e5a92835 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,3 +1,4 @@
+# typed: strong
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
diff --git a/doc/tracks_api_wrapper.rb b/doc/tracks_api_wrapper.rb
index 1911c891..cd208e7d 100644
--- a/doc/tracks_api_wrapper.rb
+++ b/doc/tracks_api_wrapper.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'activeresource'
 
 # WARNING: this is not really maintained or tested...
diff --git a/doc/tracks_cli/tracks_api.rb b/doc/tracks_cli/tracks_api.rb
index d0577755..ca23e4eb 100644
--- a/doc/tracks_cli/tracks_api.rb
+++ b/doc/tracks_cli/tracks_api.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'net/https'
 require File.expand_path(File.dirname(__FILE__) + '/tracks_xml_builder')
 
diff --git a/doc/tracks_cli/tracks_xml_builder.rb b/doc/tracks_cli/tracks_xml_builder.rb
index 2063d5a0..00bea518 100644
--- a/doc/tracks_cli/tracks_xml_builder.rb
+++ b/doc/tracks_cli/tracks_xml_builder.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'active_support/time_with_zone'
 
 module TracksCli
diff --git a/doc/tracks_cli_client.rb b/doc/tracks_cli_client.rb
index 38c6b42f..dfe03bba 100644
--- a/doc/tracks_cli_client.rb
+++ b/doc/tracks_cli_client.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# typed: false
 
 # CLI ruby client for Tracks: rails application for GTD methodology (First author: Vitalie Lazu <vitalie.lazu@gmail.com>)
 # http://www.getontracks.org/development/
diff --git a/doc/tracks_template_cli.rb b/doc/tracks_template_cli.rb
index 92d63b3e..f783319e 100644
--- a/doc/tracks_template_cli.rb
+++ b/doc/tracks_template_cli.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# typed: true
 
 #
 # Based on the tracks_cli by Vitalie Lazu (https://gist.github.com/45537)
diff --git a/lib/done_todos.rb b/lib/done_todos.rb
index 413a9e08..4b58906d 100644
--- a/lib/done_todos.rb
+++ b/lib/done_todos.rb
@@ -1,3 +1,4 @@
+# typed: true
 class DoneTodos
 
 
diff --git a/lib/is_taggable.rb b/lib/is_taggable.rb
index 59944811..6d5dd955 100644
--- a/lib/is_taggable.rb
+++ b/lib/is_taggable.rb
@@ -1,3 +1,4 @@
+# typed: false
 # These methods are adapted from has_many_polymorphs' tagging_extensions
 
 module IsTaggable
diff --git a/lib/login_system.rb b/lib/login_system.rb
index ce2e2614..6c3cf961 100644
--- a/lib/login_system.rb
+++ b/lib/login_system.rb
@@ -1,3 +1,4 @@
+# typed: false
 require_dependency "user"
 
 module LoginSystem
diff --git a/lib/project_from_todo.rb b/lib/project_from_todo.rb
index 871a487b..701b2b8c 100644
--- a/lib/project_from_todo.rb
+++ b/lib/project_from_todo.rb
@@ -1,3 +1,4 @@
+# typed: true
 class ProjectFromTodo
   attr_reader :todo
 
diff --git a/lib/staleness.rb b/lib/staleness.rb
index a3a02602..5ce41964 100644
--- a/lib/staleness.rb
+++ b/lib/staleness.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'active_support/all'
 require 'user_time'
 
diff --git a/lib/todo_from_recurring_todo.rb b/lib/todo_from_recurring_todo.rb
index ab6ee59c..3ac19867 100644
--- a/lib/todo_from_recurring_todo.rb
+++ b/lib/todo_from_recurring_todo.rb
@@ -1,3 +1,4 @@
+# typed: true
 class TodoFromRecurringTodo
   attr_reader :user, :recurring_todo, :todo
 
diff --git a/lib/tracks/attribute_handler.rb b/lib/tracks/attribute_handler.rb
index de50c965..f259f899 100644
--- a/lib/tracks/attribute_handler.rb
+++ b/lib/tracks/attribute_handler.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Tracks
 
   class AttributeHandler
diff --git a/lib/tracks/config.rb b/lib/tracks/config.rb
index f0412931..1b14f273 100644
--- a/lib/tracks/config.rb
+++ b/lib/tracks/config.rb
@@ -1,3 +1,4 @@
+# typed: true
 module Tracks
   
   class Config
diff --git a/lib/tracks/source_view.rb b/lib/tracks/source_view.rb
index 3e6ae371..c7af8d80 100644
--- a/lib/tracks/source_view.rb
+++ b/lib/tracks/source_view.rb
@@ -1,3 +1,4 @@
+# typed: false
 # Inspiration from Bruce Williams [http://codefluency.com/articles/2006/07/01/rails-views-getting-in-context/]
 module Tracks
   
diff --git a/lib/user_time.rb b/lib/user_time.rb
index 9a565f47..2db6bb2b 100644
--- a/lib/user_time.rb
+++ b/lib/user_time.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'active_support/values/time_zone'
 
 class UserTime
diff --git a/public/dispatch.rb b/public/dispatch.rb
index ce705d36..76705c22 100755
--- a/public/dispatch.rb
+++ b/public/dispatch.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# typed: false
 
 require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 
diff --git a/test/controllers/calendar_controller_test.rb b/test/controllers/calendar_controller_test.rb
index ea8560e3..418ed4dc 100644
--- a/test/controllers/calendar_controller_test.rb
+++ b/test/controllers/calendar_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class CalendarControllerTest < ActionController::TestCase
diff --git a/test/controllers/contexts_controller_test.rb b/test/controllers/contexts_controller_test.rb
index 10adb746..a4c14f09 100644
--- a/test/controllers/contexts_controller_test.rb
+++ b/test/controllers/contexts_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 require 'support/html_entity_helper'
 
diff --git a/test/controllers/data_controller_test.rb b/test/controllers/data_controller_test.rb
index 4f003fae..9e976a85 100644
--- a/test/controllers/data_controller_test.rb
+++ b/test/controllers/data_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'test_helper'
 
 class DataControllerTest < ActionController::TestCase
diff --git a/test/controllers/feedlist_controller_test.rb b/test/controllers/feedlist_controller_test.rb
index eb583e2d..109d965a 100644
--- a/test/controllers/feedlist_controller_test.rb
+++ b/test/controllers/feedlist_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class FeedlistControllerTest < ActionController::TestCase
diff --git a/test/controllers/integrations_controller_test.rb b/test/controllers/integrations_controller_test.rb
index d01c0e06..ca1b5f35 100644
--- a/test/controllers/integrations_controller_test.rb
+++ b/test/controllers/integrations_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'test_helper'
 require 'support/stub_site_config_helper'
 
diff --git a/test/controllers/login_controller_test.rb b/test/controllers/login_controller_test.rb
index 3c331a01..7aee242e 100644
--- a/test/controllers/login_controller_test.rb
+++ b/test/controllers/login_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class LoginControllerTest < ActionController::TestCase
diff --git a/test/controllers/mailgun_controller_test.rb b/test/controllers/mailgun_controller_test.rb
index 0b1300e2..436768bd 100644
--- a/test/controllers/mailgun_controller_test.rb
+++ b/test/controllers/mailgun_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 require 'support/stub_site_config_helper'
 
diff --git a/test/controllers/message_gateway_test.rb b/test/controllers/message_gateway_test.rb
index 6bb3eab9..59155d3b 100644
--- a/test/controllers/message_gateway_test.rb
+++ b/test/controllers/message_gateway_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class MessageGatewayTest < ActiveSupport::TestCase
diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index e436dd80..4046f949 100644
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class NotesControllerTest < ActionController::TestCase
diff --git a/test/controllers/preferences_controller_test.rb b/test/controllers/preferences_controller_test.rb
index cabb37f1..d04b31f2 100644
--- a/test/controllers/preferences_controller_test.rb
+++ b/test/controllers/preferences_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class PreferencesControllerTest < ActionController::TestCase
diff --git a/test/controllers/projects_controller_test.rb b/test/controllers/projects_controller_test.rb
index 023d82ba..c26bc46c 100644
--- a/test/controllers/projects_controller_test.rb
+++ b/test/controllers/projects_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 require 'support/html_entity_helper'
 
diff --git a/test/controllers/recurring_todos_controller_test.rb b/test/controllers/recurring_todos_controller_test.rb
index 46868f66..a32fb122 100644
--- a/test/controllers/recurring_todos_controller_test.rb
+++ b/test/controllers/recurring_todos_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class RecurringTodosControllerTest < ActionController::TestCase
diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb
index 06a0d8ed..41674046 100644
--- a/test/controllers/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class SearchControllerTest < ActionController::TestCase
diff --git a/test/controllers/stats_controller_test.rb b/test/controllers/stats_controller_test.rb
index 74edf489..5d6df9f7 100644
--- a/test/controllers/stats_controller_test.rb
+++ b/test/controllers/stats_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 # TODO: Add more detailed testing of the charts. There are previously defined tests in VCS before the Flash to Chart.js change.
diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb
index 731b8497..89d9d71a 100644
--- a/test/controllers/todos_controller_test.rb
+++ b/test/controllers/todos_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class TodosControllerTest < ActionController::TestCase
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 04c6a99e..18e9f8a6 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
diff --git a/test/helpers/icon_helper_test.rb b/test/helpers/icon_helper_test.rb
index 5ab2e43f..60ca436e 100644
--- a/test/helpers/icon_helper_test.rb
+++ b/test/helpers/icon_helper_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class IconHelperTest < ActionView::TestCase
diff --git a/test/helpers/rendering_helper_test.rb b/test/helpers/rendering_helper_test.rb
index 8aae34e9..8db6a626 100644
--- a/test/helpers/rendering_helper_test.rb
+++ b/test/helpers/rendering_helper_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require "test_helper"
 
 class RenderingHelperTest < ActionView::TestCase
diff --git a/test/helpers/todo_helpers_test.rb b/test/helpers/todo_helpers_test.rb
index dceb6932..8a3e47da 100644
--- a/test/helpers/todo_helpers_test.rb
+++ b/test/helpers/todo_helpers_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require "test_helper"
 
 class TodosHelpersTest < ActionView::TestCase
diff --git a/test/integration/context_xml_api_test.rb b/test/integration/context_xml_api_test.rb
index 26d5b4ec..72fbb10e 100644
--- a/test/integration/context_xml_api_test.rb
+++ b/test/integration/context_xml_api_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class ContextXmlApiTest < ActionDispatch::IntegrationTest
diff --git a/test/integration/feed_smoke_test.rb b/test/integration/feed_smoke_test.rb
index d172cdbd..e7eea6fa 100644
--- a/test/integration/feed_smoke_test.rb
+++ b/test/integration/feed_smoke_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class FeedSmokeTest < ActionDispatch::IntegrationTest
diff --git a/test/integration/project_xml_api_test.rb b/test/integration/project_xml_api_test.rb
index f6dd305a..a06313c2 100644
--- a/test/integration/project_xml_api_test.rb
+++ b/test/integration/project_xml_api_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class ProjectXmlApiTest < ActionDispatch::IntegrationTest
diff --git a/test/integration/recurring_todos_test.rb b/test/integration/recurring_todos_test.rb
index 1f461e51..93d5ab25 100644
--- a/test/integration/recurring_todos_test.rb
+++ b/test/integration/recurring_todos_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class RecurringTodosTest < ActionDispatch::IntegrationTest
diff --git a/test/integration/stories_test.rb b/test/integration/stories_test.rb
index 8e0f56a4..baa0ee39 100644
--- a/test/integration/stories_test.rb
+++ b/test/integration/stories_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 require 'support/stub_site_config_helper'
 
diff --git a/test/integration/todo_xml_api_test.rb b/test/integration/todo_xml_api_test.rb
index cbc5b022..f74a8f41 100644
--- a/test/integration/todo_xml_api_test.rb
+++ b/test/integration/todo_xml_api_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class TodoXmlApiTest < ActionDispatch::IntegrationTest
diff --git a/test/integration/users_xml_api_test.rb b/test/integration/users_xml_api_test.rb
index cca726d9..6d0319a0 100644
--- a/test/integration/users_xml_api_test.rb
+++ b/test/integration/users_xml_api_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class UsersXmlApiTest < ActionDispatch::IntegrationTest
diff --git a/test/minimal_test_helper.rb b/test/minimal_test_helper.rb
index 36afb23a..efa1fa1a 100644
--- a/test/minimal_test_helper.rb
+++ b/test/minimal_test_helper.rb
@@ -1,3 +1,4 @@
+# typed: strict
 ENV["RAILS_ENV"] ||= "test"
 require 'minitest/autorun'
 require 'mocha/setup'
diff --git a/test/models/attachment_test.rb b/test/models/attachment_test.rb
index ff491dc1..adeff906 100644
--- a/test/models/attachment_test.rb
+++ b/test/models/attachment_test.rb
@@ -1,3 +1,4 @@
+# typed: strong
 require 'test_helper'
 
 class AttachmentTest < ActiveSupport::TestCase
diff --git a/test/models/attribute_handler_test.rb b/test/models/attribute_handler_test.rb
index b45b35c3..d303052a 100644
--- a/test/models/attribute_handler_test.rb
+++ b/test/models/attribute_handler_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class AttributeHandlerTest < ActiveSupport::TestCase
diff --git a/test/models/context_test.rb b/test/models/context_test.rb
index 8d9234c8..95041730 100644
--- a/test/models/context_test.rb
+++ b/test/models/context_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class ContextTest < ActiveSupport::TestCase
diff --git a/test/models/date_label_helper_test.rb b/test/models/date_label_helper_test.rb
index e07b39ce..4a4cc567 100644
--- a/test/models/date_label_helper_test.rb
+++ b/test/models/date_label_helper_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class DateLabelHelperTest < ActiveSupport::TestCase
diff --git a/test/models/is_taggable_test.rb b/test/models/is_taggable_test.rb
index 93b7caf2..73718f80 100644
--- a/test/models/is_taggable_test.rb
+++ b/test/models/is_taggable_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class IsTaggableTest < ActiveSupport::TestCase
diff --git a/test/models/notes_test.rb b/test/models/notes_test.rb
index c3c65d68..cb380e0e 100644
--- a/test/models/notes_test.rb
+++ b/test/models/notes_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class NotesTest < ActiveSupport::TestCase
diff --git a/test/models/preference_test.rb b/test/models/preference_test.rb
index a95f1f9f..37b4b9f7 100644
--- a/test/models/preference_test.rb
+++ b/test/models/preference_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class PreferenceTest < ActiveSupport::TestCase
diff --git a/test/models/project_from_todo_test.rb b/test/models/project_from_todo_test.rb
index 6149203b..922de54e 100644
--- a/test/models/project_from_todo_test.rb
+++ b/test/models/project_from_todo_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 require_relative '../../lib/project_from_todo'
 
diff --git a/test/models/project_test.rb b/test/models/project_test.rb
index 0feeaa2c..87f6691f 100644
--- a/test/models/project_test.rb
+++ b/test/models/project_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class ProjectTest < ActiveSupport::TestCase
diff --git a/test/models/recurring_todo_test.rb b/test/models/recurring_todo_test.rb
index 8a59bf39..7051a781 100644
--- a/test/models/recurring_todo_test.rb
+++ b/test/models/recurring_todo_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class RecurringTodoTest < ActiveSupport::TestCase
diff --git a/test/models/recurring_todos/abstract_recurrence_pattern_test.rb b/test/models/recurring_todos/abstract_recurrence_pattern_test.rb
index b5d13e3c..ab64d14c 100644
--- a/test/models/recurring_todos/abstract_recurrence_pattern_test.rb
+++ b/test/models/recurring_todos/abstract_recurrence_pattern_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/abstract_recurring_todos_builder_test.rb b/test/models/recurring_todos/abstract_recurring_todos_builder_test.rb
index 0f53fb97..e82fa509 100644
--- a/test/models/recurring_todos/abstract_recurring_todos_builder_test.rb
+++ b/test/models/recurring_todos/abstract_recurring_todos_builder_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/daily_recurrence_pattern_test.rb b/test/models/recurring_todos/daily_recurrence_pattern_test.rb
index ea639cb6..e26e4aaf 100644
--- a/test/models/recurring_todos/daily_recurrence_pattern_test.rb
+++ b/test/models/recurring_todos/daily_recurrence_pattern_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/daily_recurring_todos_builder_test.rb b/test/models/recurring_todos/daily_recurring_todos_builder_test.rb
index e7e64b91..9d4d4433 100644
--- a/test/models/recurring_todos/daily_recurring_todos_builder_test.rb
+++ b/test/models/recurring_todos/daily_recurring_todos_builder_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/form_helper_test.rb b/test/models/recurring_todos/form_helper_test.rb
index 7ff13ea2..05c3654c 100644
--- a/test/models/recurring_todos/form_helper_test.rb
+++ b/test/models/recurring_todos/form_helper_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/monthly_recurrence_pattern_test.rb b/test/models/recurring_todos/monthly_recurrence_pattern_test.rb
index 40296b01..1fa1aa25 100644
--- a/test/models/recurring_todos/monthly_recurrence_pattern_test.rb
+++ b/test/models/recurring_todos/monthly_recurrence_pattern_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/monthly_recurring_todos_builder_test.rb b/test/models/recurring_todos/monthly_recurring_todos_builder_test.rb
index 7f5b80ec..725b11a4 100644
--- a/test/models/recurring_todos/monthly_recurring_todos_builder_test.rb
+++ b/test/models/recurring_todos/monthly_recurring_todos_builder_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/recurring_todos_builder_test.rb b/test/models/recurring_todos/recurring_todos_builder_test.rb
index 66d06c50..2ea2a2a4 100644
--- a/test/models/recurring_todos/recurring_todos_builder_test.rb
+++ b/test/models/recurring_todos/recurring_todos_builder_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/weekly_recurrence_pattern_test.rb b/test/models/recurring_todos/weekly_recurrence_pattern_test.rb
index e60a1fd9..6e57189c 100644
--- a/test/models/recurring_todos/weekly_recurrence_pattern_test.rb
+++ b/test/models/recurring_todos/weekly_recurrence_pattern_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/weekly_recurring_todos_builder_test.rb b/test/models/recurring_todos/weekly_recurring_todos_builder_test.rb
index 6d149546..024df905 100644
--- a/test/models/recurring_todos/weekly_recurring_todos_builder_test.rb
+++ b/test/models/recurring_todos/weekly_recurring_todos_builder_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/yearly_recurrence_pattern_test.rb b/test/models/recurring_todos/yearly_recurrence_pattern_test.rb
index 677e2180..0a55a05c 100644
--- a/test/models/recurring_todos/yearly_recurrence_pattern_test.rb
+++ b/test/models/recurring_todos/yearly_recurrence_pattern_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/recurring_todos/yearly_recurring_todos_builder_test.rb b/test/models/recurring_todos/yearly_recurring_todos_builder_test.rb
index ae06d668..93dca468 100644
--- a/test/models/recurring_todos/yearly_recurring_todos_builder_test.rb
+++ b/test/models/recurring_todos/yearly_recurring_todos_builder_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module RecurringTodos
diff --git a/test/models/rich_message_extractor_test.rb b/test/models/rich_message_extractor_test.rb
index 828234e6..aeccaf92 100644
--- a/test/models/rich_message_extractor_test.rb
+++ b/test/models/rich_message_extractor_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'date'
 require 'active_support/core_ext/object/blank'
 require_relative '../../app/services/rich_message_extractor.rb'
diff --git a/test/models/sidebar_test.rb b/test/models/sidebar_test.rb
index e559bba6..28bb7026 100644
--- a/test/models/sidebar_test.rb
+++ b/test/models/sidebar_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class SidebarTest < ActiveSupport::TestCase
diff --git a/test/models/staleness_test.rb b/test/models/staleness_test.rb
index daa93130..f27e217d 100644
--- a/test/models/staleness_test.rb
+++ b/test/models/staleness_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'minimal_test_helper'
 require_relative '../../lib/staleness'
 require_relative '../../lib/user_time'
diff --git a/test/models/tag_cloud_query_test.rb b/test/models/tag_cloud_query_test.rb
index a9bb9f22..da5f1b58 100644
--- a/test/models/tag_cloud_query_test.rb
+++ b/test/models/tag_cloud_query_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class TagCloudQueryTest < ActiveSupport::TestCase
diff --git a/test/models/tag_cloud_test.rb b/test/models/tag_cloud_test.rb
index 592ba47d..4f6cb942 100644
--- a/test/models/tag_cloud_test.rb
+++ b/test/models/tag_cloud_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'minimal_test_helper'
 require 'app/models/stats/tag_cloud'
 
diff --git a/test/models/tag_test.rb b/test/models/tag_test.rb
index b0c9b2f1..be5b5861 100644
--- a/test/models/tag_test.rb
+++ b/test/models/tag_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class TagTest < ActiveSupport::TestCase
diff --git a/test/models/tagging_test.rb b/test/models/tagging_test.rb
index b832d09e..11a4dc93 100644
--- a/test/models/tagging_test.rb
+++ b/test/models/tagging_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class TaggingTest < ActiveSupport::TestCase
diff --git a/test/models/time_to_complete_test.rb b/test/models/time_to_complete_test.rb
index ea83d487..414b3ab0 100644
--- a/test/models/time_to_complete_test.rb
+++ b/test/models/time_to_complete_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'date'
 require 'time'
 require 'minimal_test_helper'
diff --git a/test/models/todo_create_params_helper_test.rb b/test/models/todo_create_params_helper_test.rb
index bbace754..18824e31 100644
--- a/test/models/todo_create_params_helper_test.rb
+++ b/test/models/todo_create_params_helper_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 require 'todos_controller'
 
diff --git a/test/models/todo_from_rich_message_test.rb b/test/models/todo_from_rich_message_test.rb
index d8935742..4b18e595 100644
--- a/test/models/todo_from_rich_message_test.rb
+++ b/test/models/todo_from_rich_message_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class TodoFromRichMessageTest < ActiveSupport::TestCase
diff --git a/test/models/todo_test.rb b/test/models/todo_test.rb
index c257c0fe..6edf898a 100644
--- a/test/models/todo_test.rb
+++ b/test/models/todo_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class TodoTest < ActiveSupport::TestCase
diff --git a/test/models/todos/calendar_test.rb b/test/models/todos/calendar_test.rb
index f85845e6..1c654bd4 100644
--- a/test/models/todos/calendar_test.rb
+++ b/test/models/todos/calendar_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module Todos
diff --git a/test/models/todos/done_todos_test.rb b/test/models/todos/done_todos_test.rb
index 68917e91..aabd80bb 100644
--- a/test/models/todos/done_todos_test.rb
+++ b/test/models/todos/done_todos_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module Todos
diff --git a/test/models/todos/undone_todos_query_test.rb b/test/models/todos/undone_todos_query_test.rb
index 13515c06..c9ea19ba 100644
--- a/test/models/todos/undone_todos_query_test.rb
+++ b/test/models/todos/undone_todos_query_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 module Todos
diff --git a/test/models/tracks_cli/tracks_api_test.rb b/test/models/tracks_cli/tracks_api_test.rb
index a1504c58..c04e4fe7 100644
--- a/test/models/tracks_cli/tracks_api_test.rb
+++ b/test/models/tracks_cli/tracks_api_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'net/https'
 require 'minimal_test_helper'
 require './doc/tracks_cli/tracks_api'
diff --git a/test/models/tracks_cli/tracks_xml_builder_test.rb b/test/models/tracks_cli/tracks_xml_builder_test.rb
index 4e9eae0f..bfade2a1 100644
--- a/test/models/tracks_cli/tracks_xml_builder_test.rb
+++ b/test/models/tracks_cli/tracks_xml_builder_test.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'minimal_test_helper'
 require './doc/tracks_cli/tracks_xml_builder'
 require 'active_support/time_with_zone'
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 6e20d6a4..441ad040 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,3 +1,4 @@
+# typed: false
 require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
diff --git a/test/support/html_entity_helper.rb b/test/support/html_entity_helper.rb
index f948d8e9..1f597bbb 100644
--- a/test/support/html_entity_helper.rb
+++ b/test/support/html_entity_helper.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'htmlentities'
 
 module HTMLEntityHelper
diff --git a/test/support/stub_site_config_helper.rb b/test/support/stub_site_config_helper.rb
index ae3a27eb..e2e31123 100644
--- a/test/support/stub_site_config_helper.rb
+++ b/test/support/stub_site_config_helper.rb
@@ -1,3 +1,4 @@
+# typed: true
 require 'minitest/stub_const'
 
 module StubSiteConfigHelper
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 94bdf410..056a70d8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,4 @@
+# typed: false
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'