diff --git a/DisCatSharp/Clients/DiscordClient.InteractionEventHandlers.cs b/DisCatSharp/Clients/DiscordClient.InteractionEventHandlers.cs
index 497a1c603..301c755ad 100644
--- a/DisCatSharp/Clients/DiscordClient.InteractionEventHandlers.cs
+++ b/DisCatSharp/Clients/DiscordClient.InteractionEventHandlers.cs
@@ -1,226 +1,239 @@
 // This file is part of the DisCatSharp project, based off DSharpPlus.
 //
 // Copyright (c) 2021-2023 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
 #nullable enable
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace DisCatSharp;
 
 /// <summary>
 /// A Discord API wrapper.
 /// </summary>
 public sealed partial class DiscordClient
 {
 	private readonly Dictionary<(object?, Type, bool), List<(EventInfo, Delegate, bool)[]>> _registrationInteractionToDelegate = new();
 	private readonly Dictionary<Type, List<object>> _typeInteractionToAnonymousHandlers = new();
 
 	/// <summary>
 	/// Registers all methods annotated with <see cref="InteractionAttribute"/> from the given object.
 	/// </summary>
 	/// <param name="handler">The event handler object.</param>
 	/// <param name="registerStatic">Whether to consider static methods.</param>
 	public void RegisterInteractionHandler(object handler, bool registerStatic = false)
 		=> this.RegisterInteractionHandlerImpl(handler, handler.GetType(), registerStatic);
 
 	/// <summary>
 	/// Registers all static methods annotated with <see cref="InteractionAttribute"/> from the given type.
 	/// </summary>
 	/// <param name="t">The static event handler type.</param>
 	public void RegisterStaticInteractionHandler(Type t)
 		=> this.RegisterInteractionHandlerImpl(null, t);
 
 	/// <summary>
 	/// <see cref="RegisterStaticInteractionHandler(Type)"/>.
 	/// </summary>
 	/// <typeparam name="T">Type to register.</typeparam>
 	public void RegisterStaticInteractionHandler<T>()
 		=> this.RegisterStaticInteractionHandler(typeof(T));
 
 	/// <summary>
 	/// <para>If abstract, registers all static methods of the type.</para>
 	/// <para>If non-abstract, tries to instantiate it, optionally using the provided <see cref="DiscordConfiguration.ServiceProvider"/>
 	/// and registers all instance and static methods.</para>
 	/// </summary>
 	/// <param name="type">Type to register.</param>
 	public void RegisterInteractionHandler(Type type)
 	{
 		if (type.IsAbstract)
 			this.RegisterStaticInteractionHandler(type);
 		else
 		{
 			var anon = ActivatorUtilities.CreateInstance(this.Configuration.ServiceProvider, type);
 
 			this._typeInteractionToAnonymousHandlers[type] = this._typeInteractionToAnonymousHandlers.TryGetValue(type, out var anonObjs) ? anonObjs : (anonObjs = new());
 
 			anonObjs.Add(anon);
 
 			this.RegisterInteractionHandlerImpl(anon, type);
 		}
 	}
 
 	/// <summary>
 	/// <see cref="RegisterInteractionHandler(Type)"/>.
 	/// </summary>
 	/// <typeparam name="T">Type to register.</typeparam>
 	public void RegisterInteractionHandler<T>()
 		=> this.RegisterInteractionHandler(typeof(T));
 
 	/// <summary>
 	/// Registers all types associated with the provided assembly that have the <see cref="InteractionAttribute"/> attribute.
 	/// </summary>
 	/// <param name="assembly">The assembly from which to get the types.</param>
 	public void RegisterInteractionHandlers(Assembly assembly)
 	{
+		this.Logger.LogError("Registering event handlers from assembly");
 		foreach (var t in GetInteractionHandlersFromAssembly(assembly))
 			this.RegisterInteractionHandler(t);
 	}
 
 	/// <summary>
 	/// Perfectly mirrors <see cref="RegisterInteractionHandler(object, bool)"/>.
 	/// </summary>
 	/// <param name="handler">The event handler object.</param>
 	/// <param name="wasRegisteredWithStatic">Whether it considered static methods.</param>
 	public void UnregisterInteractionHandler(object handler, bool wasRegisteredWithStatic = false)
 		=> this.UnregisterInteractionHandlerImpl(handler, handler.GetType(), wasRegisteredWithStatic);
 
 	/// <summary>
 	/// Perfectly mirrors <see cref="RegisterStaticInteractionHandler(Type)"/>.
 	/// </summary>
 	/// <param name="t">Type to unregister.</param>
 	public void UnregisterStaticInteractionHandler(Type t)
 		=> this.UnregisterInteractionHandlerImpl(null, t);
 
 	/// <summary>
 	/// Perfectly mirrors <see cref="RegisterStaticInteractionHandler{T}()"/>.
 	/// </summary>
 	/// <typeparam name="T">Type to unregister.</typeparam>
 	public void UnregisterStaticInteractionHandler<T>()
 		=> this.UnregisterInteractionHandler(typeof(T));
 
 	/// <summary>
 	/// Perfectly mirrors <see cref="RegisterInteractionHandler(Type)"/>.
 	/// </summary>
 	/// <param name="t">Type to unregister.</param>
 	public void UnregisterInteractionHandler(Type t)
 	{
 		if (t.IsAbstract)
 			this.UnregisterStaticInteractionHandler(t);
 		else
 		{
 			if (!this._typeInteractionToAnonymousHandlers.TryGetValue(t, out var anonObjs) || anonObjs.Count == 0)
 				return;
 
 			var anon = anonObjs[0];
 			anonObjs.RemoveAt(0);
 
 			if (anonObjs.Count == 0)
 				this._typeInteractionToAnonymousHandlers.Remove(t);
 
 			this.UnregisterInteractionHandlerImpl(anon, t);
 		}
 	}
 
 	/// <summary>
 	/// Perfectly mirrors <see cref="RegisterInteractionHandler{T}()"/>.
 	/// </summary>
 	/// <typeparam name="T">The type to unregister</typeparam>
 	public void UnregisterInteractionHandler<T>()
 		=> this.UnregisterInteractionHandler(typeof(T));
 
 	/// <summary>
 	/// Perfectly mirrors <see cref="RegisterInteractionHandlers(Assembly)"/>.
 	/// </summary>
 	/// <param name="assembly">The assembly to unregister.</param>
 	public void UnregisterInteractionHandlers(Assembly assembly)
 	{
 		foreach (var t in GetInteractionHandlersFromAssembly(assembly))
 			this.UnregisterInteractionHandler(t);
 	}
 
 	/// <summary>
 	/// Gets the event handlers from the assembly.
 	/// </summary>
 	/// <param name="assembly">The assembly to get the event handlers from.</param>
 	private static IEnumerable<Type> GetInteractionHandlersFromAssembly(Assembly assembly)
-		=> assembly.GetTypes().Where(t => t.GetCustomAttribute<InteractionAttribute>() is not null);
+		=> assembly.GetTypes().Where(t => t.GetCustomAttribute<InteractionHandlerAttribute>() is not null);
 
 	/// <summary>
 	/// Unregisters event handler implementations.
 	/// </summary>
 	/// <param name="handler">The event handler object.</param>
 	/// <param name="type">The type.</param>
 	/// <param name="wasRegisteredWithStatic">Whether it considereded static methods.</param>
-
 	private void UnregisterInteractionHandlerImpl(object? handler, Type type, bool wasRegisteredWithStatic = true)
 	{
 		if (!this._registrationInteractionToDelegate.TryGetValue((handler, type, wasRegisteredWithStatic), out var delegateLists) || delegateLists.Count == 0)
 			return;
 
 		foreach (var (evnt, dlgt, prv) in delegateLists[0])
 			evnt.RemoveEventHandler(this, dlgt);
 
 		delegateLists.RemoveAt(0);
 		if (delegateLists.Count == 0)
 			this._registrationInteractionToDelegate.Remove((handler, type, wasRegisteredWithStatic));
 	}
 
 	/// <summary>
 	/// Rregisters event handler implementations.
 	/// </summary>
 	/// <param name="handler">The event handler object.</param>
 	/// <param name="type">The type.</param>
 	/// <param name="registerStatic">Whether to consider static methods.</param>
 	private void RegisterInteractionHandlerImpl(object? handler, Type type, bool registerStatic = true)
 	{
-		var delegates = (
+		this.Logger.LogError("Trying to register event handlers");
+		try
+		{
+			var delegates = (
 			from method in type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
 			let attribute = method.GetCustomAttribute<InteractionAttribute>()
 			where attribute is not null && ((registerStatic && method.IsStatic) || handler is not null)
 			let eventName = attribute.EventName
 			let eventInfo = this.GetType().GetEvent(eventName)
 				?? throw new ArgumentException($"Tried to register handler to non-existent event \"{eventName}\"")
 			let eventHandlerType = eventInfo.EventHandlerType
 			let prefixed = attribute.IsPrefixed
 			let dlgt = (method.IsStatic
 				? Delegate.CreateDelegate(eventHandlerType, method, false)
 				: Delegate.CreateDelegate(eventHandlerType, handler, method, false))
 				?? throw new ArgumentException($"Method \"{method}\" does not adhere to event specification \"{eventHandlerType}\"")
 			select (eventInfo, dlgt, prefixed)
 			).ToArray();
 
 		this._registrationInteractionToDelegate[(handler, type, registerStatic)] = this._registrationInteractionToDelegate.TryGetValue((handler, type, registerStatic), out var delList) ? delList : (delList = new());
 
 		delList.Add(delegates);
 
 		foreach (var (evnt, dlgt, prv) in delegates)
 			if (!prv)
 				evnt.AddEventHandler(this, dlgt);
 			else
 				evnt.AddEventHandler(this, dlgt);
+
+			this.Logger.LogError("Registered {count} interaction event handlers", delegates.Length);
+		}
+		catch (Exception ex)
+		{
+			this.Logger.LogError(ex.Message);
+			this.Logger.LogError(ex.StackTrace);
+			throw ex;
+		}
 	}
 }
diff --git a/DisCatSharp/Enums/Discord/DiscordEvent.cs b/DisCatSharp/Enums/Discord/DiscordEvent.cs
index 6f51a2e64..f083684b9 100644
--- a/DisCatSharp/Enums/Discord/DiscordEvent.cs
+++ b/DisCatSharp/Enums/Discord/DiscordEvent.cs
@@ -1,299 +1,305 @@
 // This file is part of the DisCatSharp project, based off DSharpPlus.
 //
 // Copyright (c) 2021-2023 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
 #nullable enable
 
 using System;
 
 namespace DisCatSharp.Enums;
 
 /// <summary>
 /// Methods marked with this attribute will be registered as modal handling methods.
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
 public class ModalInteractionAttribute : InteractionAttribute
 {
 	/// <summary>
 	/// The custom id to listen for.
 	/// </summary>
 	internal readonly string CustomId;
 
 	/// <summary>
 	/// Registers a method as modal handler.
 	/// </summary>
 	/// <param name="custom_id">The custom id of the modal to handle.</param>
 	public ModalInteractionAttribute(string custom_id)
 		: base("InteractionCreated")
 	{
 		this.CustomId = custom_id;
 	}
 }
 
 /// <summary>
 /// Methods marked with this attribute will be registered as modal handling methods.
 /// <para>Modal custom ids will be checked with <see cref="string.StartsWith(string)"/>.</para>
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
 public class ModalInteractionWithPrefixAttribute : InteractionAttribute
 {
 	/// <summary>
 	/// The custom id to listen for.
 	/// </summary>
 	internal readonly string CustomIdPrefix;
 
 	/// <summary>
 	/// Registers a method as modal handler.
 	/// </summary>
 	/// <param name="custom_id_prefix">The custom id prefix of the modal to handle.</param>
 	public ModalInteractionWithPrefixAttribute(string custom_id_prefix)
 		: base("InteractionCreated", true)
 	{
 		this.CustomIdPrefix = custom_id_prefix;
 	}
 }
 
 /// <summary>
 /// Methods marked with this attribute will be registered as button handling methods.
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
 public class ButtonInteractionAttribute : InteractionAttribute
 {
 	/// <summary>
 	/// The custom id to listen for.
 	/// </summary>
 	internal readonly string CustomId;
 
 	/// <summary>
 	/// Registers a method as button handler.
 	/// </summary>
 	/// <param name="custom_id">The custom id of the button to handle.</param>
 	public ButtonInteractionAttribute(string custom_id)
 		: base("ComponentInteractionCreated")
 	{
 		this.CustomId = custom_id;
 	}
 }
 
 /// <summary>
 /// Methods marked with this attribute will be registered as button handling methods.
 /// <para>Modal custom ids will be checked with <see cref="string.StartsWith(string)"/>.</para>
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
 public class ButtonInteractionWithPrefixAttribute : InteractionAttribute
 {
 	/// <summary>
 	/// The custom id to listen for.
 	/// </summary>
 	internal readonly string CustomIdPrefix;
 
 	/// <summary>
 	/// Registers a method as button handler.
 	/// </summary>
 	/// <param name="custom_id_prefix">The custom id prefix of the button to handle.</param>
 	public ButtonInteractionWithPrefixAttribute(string custom_id_prefix)
 		: base("ComponentInteractionCreated", true)
 	{
 		this.CustomIdPrefix = custom_id_prefix;
 	}
 }
 
 /// <summary>
 /// Methods marked with this attribute will be registered as select menu handling methods.
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
 public class SelectInteractionAttribute : InteractionAttribute
 {
 	/// <summary>
 	/// The custom id to listen for.
 	/// </summary>
 	internal readonly string CustomId;
 
 	/// <summary>
 	/// Registers a method as select menu handler.
 	/// </summary>
 	/// <param name="custom_id">The custom id of the select menu to handle.</param>
 	public SelectInteractionAttribute(string custom_id)
 		: base("ComponentInteractionCreated")
 	{
 		this.CustomId = custom_id;
 	}
 }
 
 /// <summary>
 /// Methods marked with this attribute will be registered as select menu handling methods.
 /// <para>Modal custom ids will be checked with <see cref="string.StartsWith(string)"/>.</para>
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
 public class SelectMenuInteractionWithPrefixAttribute : InteractionAttribute
 {
 	/// <summary>
 	/// The custom id to listen for.
 	/// </summary>
 	internal readonly string CustomIdPrefix;
 
 	/// <summary>
 	/// Registers a method as select menu handler.
 	/// </summary>
 	/// <param name="custom_id_prefix">The custom id prefix of the select menu to handle.</param>
 	public SelectMenuInteractionWithPrefixAttribute(string custom_id_prefix)
 		: base("ComponentInteractionCreated", true)
 	{
 		this.CustomIdPrefix = custom_id_prefix;
 	}
 }
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
 public class InteractionAttribute : Attribute
 {
 	internal readonly string EventName;
 	internal readonly bool IsPrefixed;
 
 	public InteractionAttribute(string event_name, bool prefixed = false)
 	{
 		this.EventName = event_name;
 		this.IsPrefixed = prefixed;
 	}
 }
 
+/// <summary>
+/// Classes marked with this attribute will be considered for event handler registration from an assembly.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+public class InteractionHandlerAttribute : Attribute { }
+
 /// <summary>
 /// Methods marked with this attribute will be registered as event handling methods
 /// if the associated type / an associated instance is being registered.
 /// </summary>
 [AttributeUsage(AttributeTargets.Method)]
 public class EventAttribute : Attribute
 {
 	/// <summary>
 	/// The event name to listen for.
 	/// </summary>
 	internal readonly string? EventName;
 
 	public EventAttribute() { }
 
 	/// <summary>
 	/// Registers a method as event handler.
 	/// </summary>
 	/// <param name="evtn"><para>The name of the event.</para>
 	/// <para>The attributed method's name will be used if null.</para></param>
 	public EventAttribute(DiscordEvent evtn)
 	{
 		this.EventName = evtn.ToString();
 	}
 }
 
 /// <summary>
 /// Classes marked with this attribute will be considered for event handler registration from an assembly.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class, Inherited = false)]
 public class EventHandlerAttribute : Attribute { }
 
 /// <summary>
 /// All events available in <see cref="DiscordClient"/> for use with <see cref="EventAttribute"/>.
 /// </summary>
 public enum DiscordEvent
 {
 	ApplicationCommandCreated,
 	ApplicationCommandDeleted,
 	ApplicationCommandPermissionsUpdated,
 	ApplicationCommandUpdated,
 	ChannelCreated,
 	ChannelDeleted,
 	ChannelPinsUpdated,
 	ChannelUpdated,
 	ClientErrored,
 	ComponentInteractionCreated,
 	ContextMenuInteractionCreated,
 	DmChannelDeleted,
 	EmbeddedActivityUpdated,
 	GuildApplicationCommandCountUpdated,
 	GuildAvailable,
 	GuildBanAdded,
 	GuildBanRemoved,
 	GuildCreated,
 	GuildDeleted,
 	GuildDownloadCompleted,
 	GuildEmojisUpdated,
 	GuildIntegrationCreated,
 	GuildIntegrationDeleted,
 	GuildIntegrationsUpdated,
 	GuildIntegrationUpdated,
 	GuildMemberAdded,
 	GuildMemberRemoved,
 	GuildMembersChunked,
 	GuildMemberTimeoutAdded,
 	GuildMemberTimeoutChanged,
 	GuildMemberTimeoutRemoved,
 	GuildMemberUpdated,
 	GuildRoleCreated,
 	GuildRoleDeleted,
 	GuildRoleUpdated,
 	GuildScheduledEventCreated,
 	GuildScheduledEventDeleted,
 	GuildScheduledEventUpdated,
 	GuildScheduledEventUserAdded,
 	GuildScheduledEventUserRemoved,
 	GuildStickersUpdated,
 	GuildUnavailable,
 	GuildUpdated,
 	Heartbeated,
 	InteractionCreated,
 	InviteCreated,
 	InviteDeleted,
 	MessageAcknowledged,
 	MessageCreated,
 	MessageDeleted,
 	MessageReactionAdded,
 	MessageReactionRemoved,
 	MessageReactionRemovedEmoji,
 	MessageReactionsCleared,
 	MessagesBulkDeleted,
 	MessageUpdated,
 	PayloadReceived,
 	PresenceUpdated,
 	RateLimitHit,
 	Ready,
 	Resumed,
 	SocketClosed,
 	SocketErrored,
 	SocketOpened,
 	StageInstanceCreated,
 	StageInstanceDeleted,
 	StageInstanceUpdated,
 	ThreadCreated,
 	ThreadDeleted,
 	ThreadListSynced,
 	ThreadMembersUpdated,
 	ThreadMemberUpdated,
 	ThreadUpdated,
 	TypingStarted,
 	UnknownEvent,
 	UserSettingsUpdated,
 	UserUpdated,
 	VoiceServerUpdated,
 	VoiceStateUpdated,
 	WebhooksUpdated,
 	Zombied,
 	AutomodRuleCreated,
 	AutomodRuleUpdated,
 	AutomodRuleDeleted,
 	AutomodActionExecuted,
 	GuildAuditLogEntryCreated
 }