diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..e34606c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 7d0f615..17f7982 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'com.android.application'
 }
 
+apply plugin: 'kotlin-android'
+
 android {
     compileSdkVersion 30
 
@@ -35,4 +37,9 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation "androidx.core:core-ktx:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kotlinhomework/MainActivity.java b/app/src/main/java/com/example/kotlinhomework/MainActivity.java
deleted file mode 100644
index 806c21b..0000000
--- a/app/src/main/java/com/example/kotlinhomework/MainActivity.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.example.kotlinhomework;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-public class MainActivity extends AppCompatActivity {
-
-    private String greetings;
-    private String name;
-    private TextView textView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        greetings = getString(R.string.hello);
-        if (savedInstanceState != null && savedInstanceState.getString(NAME_KEY) != null) {
-            name = savedInstanceState.getString(NAME_KEY);
-        } else {
-            name = getString(R.string.anon);
-        }
-
-        textView = findViewById(R.id.textViewHello);
-
-        Button button = findViewById(R.id.buttonNameYourSelf);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(MainActivity.this, SecondActivity.class);
-                startActivityForResult(intent, SecondActivity.GET_NAME_REQUEST_CODE);
-            }
-        });
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == SecondActivity.GET_NAME_REQUEST_CODE && resultCode == RESULT_OK && data != null) {
-            String nameFromData = data.getStringExtra(SecondActivity.NAME_KEY);
-
-            if (nameFromData != null) {
-                name = nameFromData;
-            }
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        textView.setText(String.format("%s, %s!", greetings, name));
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(NAME_KEY, name);
-    }
-
-    private static final String NAME_KEY = "com.example.kotlinhomework.MainActivity.NAME_KEY";
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kotlinhomework/MainActivity.kt b/app/src/main/java/com/example/kotlinhomework/MainActivity.kt
new file mode 100644
index 0000000..ec3ce20
--- /dev/null
+++ b/app/src/main/java/com/example/kotlinhomework/MainActivity.kt
@@ -0,0 +1,52 @@
+package com.example.kotlinhomework
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+
+class MainActivity : AppCompatActivity() {
+    private var greetings: String? = null
+    private var name: String? = null
+    private var textView: TextView? = null
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        greetings = getString(R.string.hello)
+        name = savedInstanceState?.getString(NAME_KEY) ?: getString(R.string.anon)
+        textView = findViewById(R.id.textViewHello)
+        val button = findViewById<Button>(R.id.buttonNameYourSelf)
+        button.setOnClickListener {
+            val intent = Intent(this@MainActivity, com.example.kotlinhomework.SecondActivity::class.java)
+            startActivityForResult(intent, com.example.kotlinhomework.SecondActivity.GET_NAME_REQUEST_CODE)
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == com.example.kotlinhomework.SecondActivity.GET_NAME_REQUEST_CODE && resultCode == RESULT_OK)
+            name = data?.getStringExtra(com.example.kotlinhomework.SecondActivity.NAME_KEY) ?: name
+    }
+
+    override fun onResume() {
+        super.onResume()
+        textView!!.text = String.format(
+                "%s, %s!",
+                greetings,
+                name
+        )
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(
+                NAME_KEY,
+                name,
+        )
+    }
+
+    companion object {
+        private const val NAME_KEY = "com.example.kotlinhomework.MainActivity.NAME_KEY"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kotlinhomework/SecondActivity.java b/app/src/main/java/com/example/kotlinhomework/SecondActivity.java
deleted file mode 100644
index 95099d2..0000000
--- a/app/src/main/java/com/example/kotlinhomework/SecondActivity.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.example.kotlinhomework;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-public class SecondActivity extends AppCompatActivity {
-
-    private EditText editText;
-    private Button button;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_second);
-
-        editText = findViewById(R.id.editTextTextPersonName);
-        button = findViewById(R.id.buttonName);
-        button.setEnabled(false);
-        editText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-                // Nothing to do
-            }
-
-            @Override
-            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-                // Nothing to do
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable) {
-                button.setEnabled(!TextUtils.isEmpty(editable));
-            }
-
-        });
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent();
-                intent.putExtra(NAME_KEY, editText.getText().toString());
-                setResult(RESULT_OK, intent);
-                finish();
-            }
-        });
-    }
-
-    public static final String NAME_KEY = "com.example.kotlinhomework.SecondActivity.NAME_KEY";
-    public static final int GET_NAME_REQUEST_CODE = 1234;
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kotlinhomework/SecondActivity.kt b/app/src/main/java/com/example/kotlinhomework/SecondActivity.kt
new file mode 100644
index 0000000..4d43bee
--- /dev/null
+++ b/app/src/main/java/com/example/kotlinhomework/SecondActivity.kt
@@ -0,0 +1,47 @@
+package com.example.kotlinhomework
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
+
+class SecondActivity : AppCompatActivity() {
+    private var editText: EditText? = null
+    private var button: Button? = null
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_second)
+        editText = findViewById(R.id.editTextTextPersonName)
+        button = findViewById(R.id.buttonName)
+        button?.isEnabled = false
+        editText?.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                // Nothing to do
+            }
+
+            override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                // Nothing to do
+            }
+
+            override fun afterTextChanged(editable: Editable) {
+                button?.isEnabled = !TextUtils.isEmpty(editable)
+            }
+        })
+        button?.setOnClickListener(View.OnClickListener {
+            val intent = Intent()
+            intent.putExtra(NAME_KEY, editText?.text.toString())
+            setResult(RESULT_OK, intent)
+            finish()
+        })
+    }
+
+    companion object {
+        const val NAME_KEY = "com.example.kotlinhomework.SecondActivity.NAME_KEY"
+        const val GET_NAME_REQUEST_CODE = 1234
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d120dda..7132cba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.4.21'
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:7.0.0-alpha02"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files