diff --git a/source/src/Slackbot.Net.Endpoints/Abstractions/IHandleTeamJoin.cs b/source/src/Slackbot.Net.Endpoints/Abstractions/IHandleTeamJoin.cs
new file mode 100644
index 0000000..db6e1bb
--- /dev/null
+++ b/source/src/Slackbot.Net.Endpoints/Abstractions/IHandleTeamJoin.cs
@@ -0,0 +1,8 @@
+using Slackbot.Net.Endpoints.Models.Events;
+
+namespace Slackbot.Net.Endpoints.Abstractions;
+
+public interface IHandleTeamJoin
+{
+    Task<EventHandledResponse> Handle(EventMetaData eventMetadata, TeamJoinEvent memberjoined);
+}
diff --git a/source/src/Slackbot.Net.Endpoints/EventTypes.cs b/source/src/Slackbot.Net.Endpoints/EventTypes.cs
index 2d4cd46..49da691 100644
--- a/source/src/Slackbot.Net.Endpoints/EventTypes.cs
+++ b/source/src/Slackbot.Net.Endpoints/EventTypes.cs
@@ -7,4 +7,5 @@ public static class EventTypes
     public const string AppMention = "app_mention";
     public const string MemberJoinedChannel = "member_joined_channel";
     public const string AppHomeOpened = "app_home_opened";
+    public const string TeamJoin = "team_join";
 }
diff --git a/source/src/Slackbot.Net.Endpoints/Hosting/IAppBuilderExtensions.cs b/source/src/Slackbot.Net.Endpoints/Hosting/IAppBuilderExtensions.cs
index 7474284..8015bae 100644
--- a/source/src/Slackbot.Net.Endpoints/Hosting/IAppBuilderExtensions.cs
+++ b/source/src/Slackbot.Net.Endpoints/Hosting/IAppBuilderExtensions.cs
@@ -19,6 +19,7 @@ public static IApplicationBuilder UseSlackbot(this IApplicationBuilder app, bool
         app.MapWhen(MemberJoinedEvents.ShouldRun, b => b.UseMiddleware<MemberJoinedEvents>());
         app.MapWhen(AppHomeOpenedEvents.ShouldRun, b => b.UseMiddleware<AppHomeOpenedEvents>());
         app.MapWhen(InteractiveEvents.ShouldRun, b => b.UseMiddleware<InteractiveEvents>());
+        app.MapWhen(TeamJoinEvents.ShouldRun, b => b.UseMiddleware<TeamJoinEvents>());
 
         return app;
     }
diff --git a/source/src/Slackbot.Net.Endpoints/Hosting/ISlackbotHandlersBuilder.cs b/source/src/Slackbot.Net.Endpoints/Hosting/ISlackbotHandlersBuilder.cs
index 8a7b19b..0007357 100644
--- a/source/src/Slackbot.Net.Endpoints/Hosting/ISlackbotHandlersBuilder.cs
+++ b/source/src/Slackbot.Net.Endpoints/Hosting/ISlackbotHandlersBuilder.cs
@@ -16,4 +16,5 @@ public ISlackbotHandlersBuilder AddInteractiveBlockActionsHandler<T>()
     public ISlackbotHandlersBuilder AddNoOpAppMentionHandler<T>() where T : class, INoOpAppMentions;
 
     public ISlackbotHandlersBuilder AddMessageActionsHandler<T>() where T : class, IHandleMessageActions;
+    public ISlackbotHandlersBuilder AddTeamJoinHandler<T>() where T : class, IHandleTeamJoin;
 }
diff --git a/source/src/Slackbot.Net.Endpoints/Hosting/SlackBotHandlersBuilder.cs b/source/src/Slackbot.Net.Endpoints/Hosting/SlackBotHandlersBuilder.cs
index 8c3ab9a..2a958f5 100644
--- a/source/src/Slackbot.Net.Endpoints/Hosting/SlackBotHandlersBuilder.cs
+++ b/source/src/Slackbot.Net.Endpoints/Hosting/SlackBotHandlersBuilder.cs
@@ -53,4 +53,10 @@ public ISlackbotHandlersBuilder AddMessageActionsHandler<T>() where T : class, I
         services.AddSingleton<IHandleMessageActions, T>();
         return this;
     }
+
+    public ISlackbotHandlersBuilder AddTeamJoinHandler<T>() where T : class, IHandleTeamJoin
+    {
+        services.AddSingleton<IHandleTeamJoin, T>();
+        return this;
+    }
 }
diff --git a/source/src/Slackbot.Net.Endpoints/Middlewares/TeamJoinEvents.cs b/source/src/Slackbot.Net.Endpoints/Middlewares/TeamJoinEvents.cs
new file mode 100644
index 0000000..4e3dcf0
--- /dev/null
+++ b/source/src/Slackbot.Net.Endpoints/Middlewares/TeamJoinEvents.cs
@@ -0,0 +1,46 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Slackbot.Net.Endpoints.Abstractions;
+using Slackbot.Net.Endpoints.Models.Events;
+
+namespace Slackbot.Net.Endpoints.Middlewares;
+
+internal class TeamJoinEvents(
+    ILogger<TeamJoinEvents> logger,
+    IEnumerable<IHandleTeamJoin> responseHandlers
+)
+{
+    public async Task Invoke(HttpContext context)
+    {
+        var teamJoinEvent = (TeamJoinEvent)context.Items[HttpItemKeys.SlackEventKey];
+        var metadata = (EventMetaData)context.Items[HttpItemKeys.EventMetadataKey];
+        var handler = responseHandlers.FirstOrDefault();
+
+        if (handler == null)
+        {
+            logger.LogError("No handler registered for IHandleTeamJoinEvents");
+        }
+        else
+        {
+            logger.LogInformation("Handling using {HandlerType}", handler.GetType());
+            try
+            {
+                logger.LogInformation("Handling using {HandlerType}", handler.GetType());
+                var response = await handler.Handle(metadata, teamJoinEvent);
+                logger.LogInformation("Handler response: {Response}", response.Response);
+            }
+            catch (Exception e)
+            {
+                logger.LogError(e, e.Message);
+            }
+        }
+
+        context.Response.StatusCode = 200;
+    }
+
+    public static bool ShouldRun(HttpContext ctx)
+    {
+        return ctx.Items.ContainsKey(HttpItemKeys.EventTypeKey)
+            && ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.TeamJoin;
+    }
+}
diff --git a/source/src/Slackbot.Net.Endpoints/Models/Events/TeamJoinEvent.cs b/source/src/Slackbot.Net.Endpoints/Models/Events/TeamJoinEvent.cs
new file mode 100644
index 0000000..f0570c4
--- /dev/null
+++ b/source/src/Slackbot.Net.Endpoints/Models/Events/TeamJoinEvent.cs
@@ -0,0 +1,6 @@
+namespace Slackbot.Net.Endpoints.Models.Events;
+
+public class TeamJoinEvent : SlackEvent
+{
+    public string User { get; set; }
+}
diff --git a/source/src/Slackbot.Net.Shared/BlockElements.cs b/source/src/Slackbot.Net.Shared/BlockElements.cs
index 2bbb6a7..d3c56a7 100644
--- a/source/src/Slackbot.Net.Shared/BlockElements.cs
+++ b/source/src/Slackbot.Net.Shared/BlockElements.cs
@@ -38,7 +38,8 @@ public class ContextBlock : IBlock
 
 public class InputBlock : IBlock
 {
-    public string type { get; set;} = BlockTypes.Input;
+    public string block_id { get; set; }
+    public string type { get; set; } = BlockTypes.Input;
     public IElement element { get; set; }
     public Text label { get; set; }
     public bool dispatch_action { get; set; }
@@ -175,16 +176,26 @@ public class OverflowElement : IElement
 
 public class DatePickerElement : IElement
 {
-    public string type { get; set;} = ElementTypes.DatePicker;
+    public string type { get; set; } = ElementTypes.DatePicker;
     public string action_id { get; set; }
     public Text placeholder { get; set; }
     public string initial_date { get; set; }
     public Confirm confirm { get; set; }
 }
 
+public class RadioButtonsElement : IElement
+{
+    public string type { get; set; } = ElementTypes.RadioButtons;
+    public string action_id { get; set; }
+    public Option[] options { get; set; }
+    public string initial_option { get; set; }
+    public Confirm confirm { get; set; }
+    public bool focus_on_load { get; set; }
+}
+
 public class PlainTextElement : IElement
 {
-    public string type { get; set;} = ElementTypes.PlainTextInput;
+    public string type { get; set; } = ElementTypes.PlainTextInput;
     public string action_id { get; set; }
     public Text placeholder { get; set; }
 }
@@ -223,9 +234,10 @@ public static class ElementTypes
     public const string Overflow = "overflow";
     public const string DatePicker = "datepicker";
     public const string PlainTextInput = "plain_text_input";
+    public const string RadioButtons = "radio_buttons";
 }
-    
+
 public interface IHaveType { string type { get; set; } }
 
 public interface IElement : IHaveType { }
-public interface IBlock : IHaveType { }
\ No newline at end of file
+public interface IBlock : IHaveType { }