diff --git a/.editorconfig b/.editorconfig
index bb35dfb7..2b58a138 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,1191 +1,1191 @@
-[*]
-charset = utf-8
-end_of_line = crlf
-indent_size = 4
-indent_style = space
-insert_final_newline = false
-max_line_length = 120
-tab_width = 4
-ij_continuation_indent_size = 8
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
-ij_smart_tabs = false
-ij_visual_guides = none
-ij_wrap_on_typing = false
-
-[*.css]
-ij_css_align_closing_brace_with_properties = false
-ij_css_blank_lines_around_nested_selector = 1
-ij_css_blank_lines_between_blocks = 1
-ij_css_brace_placement = end_of_line
-ij_css_enforce_quotes_on_format = false
-ij_css_hex_color_long_format = false
-ij_css_hex_color_lower_case = false
-ij_css_hex_color_short_format = false
-ij_css_hex_color_upper_case = false
-ij_css_keep_blank_lines_in_code = 2
-ij_css_keep_indents_on_empty_lines = false
-ij_css_keep_single_line_blocks = false
-ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_css_space_after_colon = true
-ij_css_space_before_opening_brace = true
-ij_css_use_double_quotes = true
-ij_css_value_alignment = do_not_align
-
-[*.feature]
-indent_size = 2
-ij_gherkin_keep_indents_on_empty_lines = false
-
-[*.haml]
-indent_size = 2
-ij_haml_keep_indents_on_empty_lines = false
-
-[*.java]
-ij_java_align_consecutive_assignments = false
-ij_java_align_consecutive_variable_declarations = false
-ij_java_align_group_field_declarations = false
-ij_java_align_multiline_annotation_parameters = false
-ij_java_align_multiline_array_initializer_expression = false
-ij_java_align_multiline_assignment = false
-ij_java_align_multiline_binary_operation = false
-ij_java_align_multiline_chained_methods = false
-ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = false
-ij_java_align_multiline_parameters = true
-ij_java_align_multiline_parameters_in_calls = false
-ij_java_align_multiline_parenthesized_expression = false
-ij_java_align_multiline_records = true
-ij_java_align_multiline_resources = true
-ij_java_align_multiline_ternary_operation = false
-ij_java_align_multiline_text_blocks = false
-ij_java_align_multiline_throws_list = false
-ij_java_align_subsequent_simple_methods = false
-ij_java_align_throws_keyword = false
-ij_java_annotation_parameter_wrap = off
-ij_java_array_initializer_new_line_after_left_brace = false
-ij_java_array_initializer_right_brace_on_new_line = false
-ij_java_array_initializer_wrap = off
-ij_java_assert_statement_colon_on_next_line = false
-ij_java_assert_statement_wrap = off
-ij_java_assignment_wrap = off
-ij_java_binary_operation_sign_on_next_line = false
-ij_java_binary_operation_wrap = off
-ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 1
-ij_java_blank_lines_after_imports = 1
-ij_java_blank_lines_after_package = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_around_field = 0
-ij_java_blank_lines_around_field_in_interface = 0
-ij_java_blank_lines_around_initializer = 1
-ij_java_blank_lines_around_method = 1
-ij_java_blank_lines_around_method_in_interface = 1
-ij_java_blank_lines_before_class_end = 0
-ij_java_blank_lines_before_imports = 1
-ij_java_blank_lines_before_method_body = 0
-ij_java_blank_lines_before_package = 0
-ij_java_block_brace_style = end_of_line
-ij_java_block_comment_at_first_column = true
-ij_java_call_parameters_new_line_after_left_paren = false
-ij_java_call_parameters_right_paren_on_new_line = false
-ij_java_call_parameters_wrap = off
-ij_java_case_statement_on_separate_line = true
-ij_java_catch_on_new_line = false
-ij_java_class_annotation_wrap = split_into_lines
-ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 2
-ij_java_class_names_in_javadoc = 1
-ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_while_brace_force = never
-ij_java_doc_add_blank_line_after_description = true
-ij_java_doc_add_blank_line_after_param_comments = false
-ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
-ij_java_doc_do_not_wrap_if_one_line = false
-ij_java_doc_enable_formatting = true
-ij_java_doc_enable_leading_asterisks = true
-ij_java_doc_indent_on_continuation = false
-ij_java_doc_keep_empty_lines = true
-ij_java_doc_keep_empty_parameter_tag = true
-ij_java_doc_keep_empty_return_tag = true
-ij_java_doc_keep_empty_throws_tag = true
-ij_java_doc_keep_invalid_tags = true
-ij_java_doc_param_description_on_new_line = false
-ij_java_doc_preserve_line_breaks = false
-ij_java_doc_use_throws_not_exception_tag = true
-ij_java_else_on_new_line = false
-ij_java_entity_dd_suffix = EJB
-ij_java_entity_eb_suffix = Bean
-ij_java_entity_hi_suffix = Home
-ij_java_entity_lhi_prefix = Local
-ij_java_entity_lhi_suffix = Home
-ij_java_entity_li_prefix = Local
-ij_java_entity_pk_class = java.lang.String
-ij_java_entity_vo_suffix = VO
-ij_java_enum_constants_wrap = off
-ij_java_extends_keyword_wrap = off
-ij_java_extends_list_wrap = off
-ij_java_field_annotation_wrap = split_into_lines
-ij_java_finally_on_new_line = false
-ij_java_for_brace_force = never
-ij_java_for_statement_new_line_after_left_paren = false
-ij_java_for_statement_right_paren_on_new_line = false
-ij_java_for_statement_wrap = off
-ij_java_generate_final_locals = false
-ij_java_generate_final_parameters = false
-ij_java_if_brace_force = never
-ij_java_imports_layout = *,|,javax.**,java.**,|,$*
-ij_java_indent_case_from_switch = true
-ij_java_insert_inner_class_imports = false
-ij_java_insert_override_annotation = true
-ij_java_keep_blank_lines_before_right_brace = 2
-ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-ij_java_keep_blank_lines_in_code = 2
-ij_java_keep_blank_lines_in_declarations = 2
-ij_java_keep_control_statement_in_one_line = true
-ij_java_keep_first_column_comment = true
-ij_java_keep_indents_on_empty_lines = true
-ij_java_keep_line_breaks = true
-ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = false
-ij_java_keep_simple_lambdas_in_one_line = false
-ij_java_keep_simple_methods_in_one_line = false
-ij_java_label_indent_absolute = false
-ij_java_label_indent_size = 0
-ij_java_lambda_brace_style = end_of_line
-ij_java_layout_static_imports_separately = true
-ij_java_line_comment_add_space = false
-ij_java_line_comment_at_first_column = true
-ij_java_message_dd_suffix = EJB
-ij_java_message_eb_suffix = Bean
-ij_java_method_annotation_wrap = split_into_lines
-ij_java_method_brace_style = end_of_line
-ij_java_method_call_chain_wrap = off
-ij_java_method_parameters_new_line_after_left_paren = false
-ij_java_method_parameters_right_paren_on_new_line = false
-ij_java_method_parameters_wrap = off
-ij_java_modifier_list_wrap = false
-ij_java_names_count_to_use_import_on_demand = 3
-ij_java_new_line_after_lparen_in_record_header = false
-ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
-ij_java_parameter_annotation_wrap = off
-ij_java_parentheses_expression_new_line_after_left_paren = false
-ij_java_parentheses_expression_right_paren_on_new_line = false
-ij_java_place_assignment_sign_on_next_line = false
-ij_java_prefer_longer_names = true
-ij_java_prefer_parameters_wrap = false
-ij_java_record_components_wrap = normal
-ij_java_repeat_synchronized = true
-ij_java_replace_instanceof_and_cast = false
-ij_java_replace_null_check = true
-ij_java_replace_sum_lambda_with_method_ref = true
-ij_java_resource_list_new_line_after_left_paren = false
-ij_java_resource_list_right_paren_on_new_line = false
-ij_java_resource_list_wrap = off
-ij_java_rparen_on_new_line_in_record_header = false
-ij_java_session_dd_suffix = EJB
-ij_java_session_eb_suffix = Bean
-ij_java_session_hi_suffix = Home
-ij_java_session_lhi_prefix = Local
-ij_java_session_lhi_suffix = Home
-ij_java_session_li_prefix = Local
-ij_java_session_si_suffix = Service
-ij_java_space_after_closing_angle_bracket_in_type_argument = false
-ij_java_space_after_colon = true
-ij_java_space_after_comma = true
-ij_java_space_after_comma_in_type_arguments = true
-ij_java_space_after_for_semicolon = true
-ij_java_space_after_quest = true
-ij_java_space_after_type_cast = true
-ij_java_space_before_annotation_array_initializer_left_brace = false
-ij_java_space_before_annotation_parameter_list = false
-ij_java_space_before_array_initializer_left_brace = false
-ij_java_space_before_catch_keyword = true
-ij_java_space_before_catch_left_brace = true
-ij_java_space_before_catch_parentheses = true
-ij_java_space_before_class_left_brace = true
-ij_java_space_before_colon = true
-ij_java_space_before_colon_in_foreach = true
-ij_java_space_before_comma = false
-ij_java_space_before_do_left_brace = true
-ij_java_space_before_else_keyword = true
-ij_java_space_before_else_left_brace = true
-ij_java_space_before_finally_keyword = true
-ij_java_space_before_finally_left_brace = true
-ij_java_space_before_for_left_brace = true
-ij_java_space_before_for_parentheses = true
-ij_java_space_before_for_semicolon = false
-ij_java_space_before_if_left_brace = true
-ij_java_space_before_if_parentheses = true
-ij_java_space_before_method_call_parentheses = false
-ij_java_space_before_method_left_brace = true
-ij_java_space_before_method_parentheses = false
-ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-ij_java_space_before_quest = true
-ij_java_space_before_switch_left_brace = true
-ij_java_space_before_switch_parentheses = true
-ij_java_space_before_synchronized_left_brace = true
-ij_java_space_before_synchronized_parentheses = true
-ij_java_space_before_try_left_brace = true
-ij_java_space_before_try_parentheses = true
-ij_java_space_before_type_parameter_list = false
-ij_java_space_before_while_keyword = true
-ij_java_space_before_while_left_brace = true
-ij_java_space_before_while_parentheses = true
-ij_java_space_inside_one_line_enum_braces = false
-ij_java_space_within_empty_array_initializer_braces = false
-ij_java_space_within_empty_method_call_parentheses = false
-ij_java_space_within_empty_method_parentheses = false
-ij_java_spaces_around_additive_operators = true
-ij_java_spaces_around_assignment_operators = true
-ij_java_spaces_around_bitwise_operators = true
-ij_java_spaces_around_equality_operators = true
-ij_java_spaces_around_lambda_arrow = true
-ij_java_spaces_around_logical_operators = true
-ij_java_spaces_around_method_ref_dbl_colon = false
-ij_java_spaces_around_multiplicative_operators = true
-ij_java_spaces_around_relational_operators = true
-ij_java_spaces_around_shift_operators = true
-ij_java_spaces_around_type_bounds_in_type_parameters = true
-ij_java_spaces_around_unary_operator = false
-ij_java_spaces_within_angle_brackets = false
-ij_java_spaces_within_annotation_parentheses = false
-ij_java_spaces_within_array_initializer_braces = false
-ij_java_spaces_within_braces = false
-ij_java_spaces_within_brackets = false
-ij_java_spaces_within_cast_parentheses = false
-ij_java_spaces_within_catch_parentheses = false
-ij_java_spaces_within_for_parentheses = false
-ij_java_spaces_within_if_parentheses = false
-ij_java_spaces_within_method_call_parentheses = false
-ij_java_spaces_within_method_parentheses = false
-ij_java_spaces_within_parentheses = false
-ij_java_spaces_within_record_header = false
-ij_java_spaces_within_switch_parentheses = false
-ij_java_spaces_within_synchronized_parentheses = false
-ij_java_spaces_within_try_parentheses = false
-ij_java_spaces_within_while_parentheses = false
-ij_java_special_else_if_treatment = true
-ij_java_subclass_name_suffix = Impl
-ij_java_ternary_operation_signs_on_next_line = false
-ij_java_ternary_operation_wrap = off
-ij_java_test_name_suffix = Test
-ij_java_throws_keyword_wrap = off
-ij_java_throws_list_wrap = off
-ij_java_use_external_annotations = false
-ij_java_use_fq_class_names = false
-ij_java_use_relative_indents = false
-ij_java_use_single_class_imports = true
-ij_java_variable_annotation_wrap = off
-ij_java_visibility = public
-ij_java_while_brace_force = never
-ij_java_while_on_new_line = false
-ij_java_wrap_comments = false
-ij_java_wrap_first_method_in_call_chain = false
-ij_java_wrap_long_lines = false
-
-[*.less]
-indent_size = 2
-ij_less_align_closing_brace_with_properties = false
-ij_less_blank_lines_around_nested_selector = 1
-ij_less_blank_lines_between_blocks = 1
-ij_less_brace_placement = 0
-ij_less_enforce_quotes_on_format = false
-ij_less_hex_color_long_format = false
-ij_less_hex_color_lower_case = false
-ij_less_hex_color_short_format = false
-ij_less_hex_color_upper_case = false
-ij_less_keep_blank_lines_in_code = 2
-ij_less_keep_indents_on_empty_lines = false
-ij_less_keep_single_line_blocks = false
-ij_less_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_less_space_after_colon = true
-ij_less_space_before_opening_brace = true
-ij_less_use_double_quotes = true
-ij_less_value_alignment = 0
-
-[*.nbtt]
-max_line_length = 150
-ij_continuation_indent_size = 4
-ij_nbtt_keep_indents_on_empty_lines = false
-ij_nbtt_space_after_colon = true
-ij_nbtt_space_after_comma = true
-ij_nbtt_space_before_colon = true
-ij_nbtt_space_before_comma = false
-ij_nbtt_spaces_within_brackets = false
-ij_nbtt_spaces_within_parentheses = false
-
-[*.sass]
-indent_size = 2
-ij_sass_align_closing_brace_with_properties = false
-ij_sass_blank_lines_around_nested_selector = 1
-ij_sass_blank_lines_between_blocks = 1
-ij_sass_brace_placement = 0
-ij_sass_enforce_quotes_on_format = false
-ij_sass_hex_color_long_format = false
-ij_sass_hex_color_lower_case = false
-ij_sass_hex_color_short_format = false
-ij_sass_hex_color_upper_case = false
-ij_sass_keep_blank_lines_in_code = 2
-ij_sass_keep_indents_on_empty_lines = false
-ij_sass_keep_single_line_blocks = false
-ij_sass_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_sass_space_after_colon = true
-ij_sass_space_before_opening_brace = true
-ij_sass_use_double_quotes = true
-ij_sass_value_alignment = 0
-
-[*.scss]
-indent_size = 2
-ij_scss_align_closing_brace_with_properties = false
-ij_scss_blank_lines_around_nested_selector = 1
-ij_scss_blank_lines_between_blocks = 1
-ij_scss_brace_placement = 0
-ij_scss_enforce_quotes_on_format = false
-ij_scss_hex_color_long_format = false
-ij_scss_hex_color_lower_case = false
-ij_scss_hex_color_short_format = false
-ij_scss_hex_color_upper_case = false
-ij_scss_keep_blank_lines_in_code = 2
-ij_scss_keep_indents_on_empty_lines = false
-ij_scss_keep_single_line_blocks = false
-ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_scss_space_after_colon = true
-ij_scss_space_before_opening_brace = true
-ij_scss_use_double_quotes = true
-ij_scss_value_alignment = 0
-
-[*.styl]
-indent_size = 2
-ij_stylus_align_closing_brace_with_properties = false
-ij_stylus_blank_lines_around_nested_selector = 1
-ij_stylus_blank_lines_between_blocks = 1
-ij_stylus_brace_placement = 0
-ij_stylus_enforce_quotes_on_format = false
-ij_stylus_hex_color_long_format = false
-ij_stylus_hex_color_lower_case = false
-ij_stylus_hex_color_short_format = false
-ij_stylus_hex_color_upper_case = false
-ij_stylus_keep_blank_lines_in_code = 2
-ij_stylus_keep_indents_on_empty_lines = false
-ij_stylus_keep_single_line_blocks = false
-ij_stylus_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_stylus_space_after_colon = true
-ij_stylus_space_before_opening_brace = true
-ij_stylus_use_double_quotes = true
-ij_stylus_value_alignment = 0
-
-[.editorconfig]
-ij_editorconfig_align_group_field_declarations = false
-ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = true
-ij_editorconfig_space_before_colon = false
-ij_editorconfig_space_before_comma = false
-ij_editorconfig_spaces_around_assignment_operators = true
-
-[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.pom,*.rng,*.tld,*.wadl,*.wsdd,*.wsdl,*.xjb,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
-ij_xml_align_attributes = true
-ij_xml_align_text = false
-ij_xml_attribute_wrap = normal
-ij_xml_block_comment_at_first_column = true
-ij_xml_keep_blank_lines = 2
-ij_xml_keep_indents_on_empty_lines = false
-ij_xml_keep_line_breaks = true
-ij_xml_keep_line_breaks_in_text = true
-ij_xml_keep_whitespaces = false
-ij_xml_keep_whitespaces_around_cdata = preserve
-ij_xml_keep_whitespaces_inside_cdata = false
-ij_xml_line_comment_at_first_column = true
-ij_xml_space_after_tag_name = false
-ij_xml_space_around_equals_in_attribute = false
-ij_xml_space_inside_empty_tag = false
-ij_xml_text_wrap = normal
-
-[{*.ats,*.ts}]
-ij_continuation_indent_size = 4
-ij_typescript_align_imports = false
-ij_typescript_align_multiline_array_initializer_expression = false
-ij_typescript_align_multiline_binary_operation = false
-ij_typescript_align_multiline_chained_methods = false
-ij_typescript_align_multiline_extends_list = false
-ij_typescript_align_multiline_for = true
-ij_typescript_align_multiline_parameters = true
-ij_typescript_align_multiline_parameters_in_calls = false
-ij_typescript_align_multiline_ternary_operation = false
-ij_typescript_align_object_properties = 0
-ij_typescript_align_union_types = false
-ij_typescript_align_var_statements = 0
-ij_typescript_array_initializer_new_line_after_left_brace = false
-ij_typescript_array_initializer_right_brace_on_new_line = false
-ij_typescript_array_initializer_wrap = off
-ij_typescript_assignment_wrap = off
-ij_typescript_binary_operation_sign_on_next_line = false
-ij_typescript_binary_operation_wrap = off
-ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
-ij_typescript_blank_lines_after_imports = 1
-ij_typescript_blank_lines_around_class = 1
-ij_typescript_blank_lines_around_field = 0
-ij_typescript_blank_lines_around_field_in_interface = 0
-ij_typescript_blank_lines_around_function = 1
-ij_typescript_blank_lines_around_method = 1
-ij_typescript_blank_lines_around_method_in_interface = 1
-ij_typescript_block_brace_style = end_of_line
-ij_typescript_call_parameters_new_line_after_left_paren = false
-ij_typescript_call_parameters_right_paren_on_new_line = false
-ij_typescript_call_parameters_wrap = off
-ij_typescript_catch_on_new_line = false
-ij_typescript_chained_call_dot_on_new_line = true
-ij_typescript_class_brace_style = end_of_line
-ij_typescript_comma_on_new_line = false
-ij_typescript_do_while_brace_force = never
-ij_typescript_else_on_new_line = false
-ij_typescript_enforce_trailing_comma = keep
-ij_typescript_extends_keyword_wrap = off
-ij_typescript_extends_list_wrap = off
-ij_typescript_field_prefix = _
-ij_typescript_file_name_style = relaxed
-ij_typescript_finally_on_new_line = false
-ij_typescript_for_brace_force = never
-ij_typescript_for_statement_new_line_after_left_paren = false
-ij_typescript_for_statement_right_paren_on_new_line = false
-ij_typescript_for_statement_wrap = off
-ij_typescript_force_quote_style = false
-ij_typescript_force_semicolon_style = false
-ij_typescript_function_expression_brace_style = end_of_line
-ij_typescript_if_brace_force = never
-ij_typescript_import_merge_members = global
-ij_typescript_import_prefer_absolute_path = global
-ij_typescript_import_sort_members = true
-ij_typescript_import_sort_module_name = false
-ij_typescript_import_use_node_resolution = true
-ij_typescript_imports_wrap = on_every_item
-ij_typescript_indent_case_from_switch = true
-ij_typescript_indent_chained_calls = true
-ij_typescript_indent_package_children = 0
-ij_typescript_jsdoc_include_types = false
-ij_typescript_jsx_attribute_value = braces
-ij_typescript_keep_blank_lines_in_code = 2
-ij_typescript_keep_first_column_comment = true
-ij_typescript_keep_indents_on_empty_lines = false
-ij_typescript_keep_line_breaks = true
-ij_typescript_keep_simple_blocks_in_one_line = false
-ij_typescript_keep_simple_methods_in_one_line = false
-ij_typescript_line_comment_add_space = true
-ij_typescript_line_comment_at_first_column = false
-ij_typescript_method_brace_style = end_of_line
-ij_typescript_method_call_chain_wrap = off
-ij_typescript_method_parameters_new_line_after_left_paren = false
-ij_typescript_method_parameters_right_paren_on_new_line = false
-ij_typescript_method_parameters_wrap = off
-ij_typescript_object_literal_wrap = on_every_item
-ij_typescript_parentheses_expression_new_line_after_left_paren = false
-ij_typescript_parentheses_expression_right_paren_on_new_line = false
-ij_typescript_place_assignment_sign_on_next_line = false
-ij_typescript_prefer_as_type_cast = false
-ij_typescript_prefer_explicit_types_function_expression_returns = false
-ij_typescript_prefer_explicit_types_function_returns = false
-ij_typescript_prefer_explicit_types_vars_fields = false
-ij_typescript_prefer_parameters_wrap = false
-ij_typescript_reformat_c_style_comments = false
-ij_typescript_space_after_colon = true
-ij_typescript_space_after_comma = true
-ij_typescript_space_after_dots_in_rest_parameter = false
-ij_typescript_space_after_generator_mult = true
-ij_typescript_space_after_property_colon = true
-ij_typescript_space_after_quest = true
-ij_typescript_space_after_type_colon = true
-ij_typescript_space_after_unary_not = false
-ij_typescript_space_before_async_arrow_lparen = true
-ij_typescript_space_before_catch_keyword = true
-ij_typescript_space_before_catch_left_brace = true
-ij_typescript_space_before_catch_parentheses = true
-ij_typescript_space_before_class_lbrace = true
-ij_typescript_space_before_class_left_brace = true
-ij_typescript_space_before_colon = true
-ij_typescript_space_before_comma = false
-ij_typescript_space_before_do_left_brace = true
-ij_typescript_space_before_else_keyword = true
-ij_typescript_space_before_else_left_brace = true
-ij_typescript_space_before_finally_keyword = true
-ij_typescript_space_before_finally_left_brace = true
-ij_typescript_space_before_for_left_brace = true
-ij_typescript_space_before_for_parentheses = true
-ij_typescript_space_before_for_semicolon = false
-ij_typescript_space_before_function_left_parenth = true
-ij_typescript_space_before_generator_mult = false
-ij_typescript_space_before_if_left_brace = true
-ij_typescript_space_before_if_parentheses = true
-ij_typescript_space_before_method_call_parentheses = false
-ij_typescript_space_before_method_left_brace = true
-ij_typescript_space_before_method_parentheses = false
-ij_typescript_space_before_property_colon = false
-ij_typescript_space_before_quest = true
-ij_typescript_space_before_switch_left_brace = true
-ij_typescript_space_before_switch_parentheses = true
-ij_typescript_space_before_try_left_brace = true
-ij_typescript_space_before_type_colon = false
-ij_typescript_space_before_unary_not = false
-ij_typescript_space_before_while_keyword = true
-ij_typescript_space_before_while_left_brace = true
-ij_typescript_space_before_while_parentheses = true
-ij_typescript_spaces_around_additive_operators = true
-ij_typescript_spaces_around_arrow_function_operator = true
-ij_typescript_spaces_around_assignment_operators = true
-ij_typescript_spaces_around_bitwise_operators = true
-ij_typescript_spaces_around_equality_operators = true
-ij_typescript_spaces_around_logical_operators = true
-ij_typescript_spaces_around_multiplicative_operators = true
-ij_typescript_spaces_around_relational_operators = true
-ij_typescript_spaces_around_shift_operators = true
-ij_typescript_spaces_around_unary_operator = false
-ij_typescript_spaces_within_array_initializer_brackets = false
-ij_typescript_spaces_within_brackets = false
-ij_typescript_spaces_within_catch_parentheses = false
-ij_typescript_spaces_within_for_parentheses = false
-ij_typescript_spaces_within_if_parentheses = false
-ij_typescript_spaces_within_imports = false
-ij_typescript_spaces_within_interpolation_expressions = false
-ij_typescript_spaces_within_method_call_parentheses = false
-ij_typescript_spaces_within_method_parentheses = false
-ij_typescript_spaces_within_object_literal_braces = false
-ij_typescript_spaces_within_object_type_braces = true
-ij_typescript_spaces_within_parentheses = false
-ij_typescript_spaces_within_switch_parentheses = false
-ij_typescript_spaces_within_type_assertion = false
-ij_typescript_spaces_within_union_types = true
-ij_typescript_spaces_within_while_parentheses = false
-ij_typescript_special_else_if_treatment = true
-ij_typescript_ternary_operation_signs_on_next_line = false
-ij_typescript_ternary_operation_wrap = off
-ij_typescript_union_types_wrap = on_every_item
-ij_typescript_use_chained_calls_group_indents = false
-ij_typescript_use_double_quotes = true
-ij_typescript_use_explicit_js_extension = global
-ij_typescript_use_path_mapping = always
-ij_typescript_use_public_modifier = false
-ij_typescript_use_semicolon_after_statement = true
-ij_typescript_var_declaration_wrap = normal
-ij_typescript_while_brace_force = never
-ij_typescript_while_on_new_line = false
-ij_typescript_wrap_comments = false
-
-[{*.bash,*.sh,*.zsh}]
-indent_size = 2
-tab_width = 2
-ij_shell_binary_ops_start_line = false
-ij_shell_keep_column_alignment_padding = false
-ij_shell_minify_program = false
-ij_shell_redirect_followed_by_space = false
-ij_shell_switch_cases_indented = false
-
-[{*.cjs,*.js}]
-ij_continuation_indent_size = 4
-ij_javascript_align_imports = false
-ij_javascript_align_multiline_array_initializer_expression = false
-ij_javascript_align_multiline_binary_operation = false
-ij_javascript_align_multiline_chained_methods = false
-ij_javascript_align_multiline_extends_list = false
-ij_javascript_align_multiline_for = true
-ij_javascript_align_multiline_parameters = true
-ij_javascript_align_multiline_parameters_in_calls = false
-ij_javascript_align_multiline_ternary_operation = false
-ij_javascript_align_object_properties = 0
-ij_javascript_align_union_types = false
-ij_javascript_align_var_statements = 0
-ij_javascript_array_initializer_new_line_after_left_brace = false
-ij_javascript_array_initializer_right_brace_on_new_line = false
-ij_javascript_array_initializer_wrap = off
-ij_javascript_assignment_wrap = off
-ij_javascript_binary_operation_sign_on_next_line = false
-ij_javascript_binary_operation_wrap = off
-ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
-ij_javascript_blank_lines_after_imports = 1
-ij_javascript_blank_lines_around_class = 1
-ij_javascript_blank_lines_around_field = 0
-ij_javascript_blank_lines_around_function = 1
-ij_javascript_blank_lines_around_method = 1
-ij_javascript_block_brace_style = end_of_line
-ij_javascript_call_parameters_new_line_after_left_paren = false
-ij_javascript_call_parameters_right_paren_on_new_line = false
-ij_javascript_call_parameters_wrap = off
-ij_javascript_catch_on_new_line = false
-ij_javascript_chained_call_dot_on_new_line = true
-ij_javascript_class_brace_style = end_of_line
-ij_javascript_comma_on_new_line = false
-ij_javascript_do_while_brace_force = never
-ij_javascript_else_on_new_line = false
-ij_javascript_enforce_trailing_comma = keep
-ij_javascript_extends_keyword_wrap = off
-ij_javascript_extends_list_wrap = off
-ij_javascript_field_prefix = _
-ij_javascript_file_name_style = relaxed
-ij_javascript_finally_on_new_line = false
-ij_javascript_for_brace_force = never
-ij_javascript_for_statement_new_line_after_left_paren = false
-ij_javascript_for_statement_right_paren_on_new_line = false
-ij_javascript_for_statement_wrap = off
-ij_javascript_force_quote_style = false
-ij_javascript_force_semicolon_style = false
-ij_javascript_function_expression_brace_style = end_of_line
-ij_javascript_if_brace_force = never
-ij_javascript_import_merge_members = global
-ij_javascript_import_prefer_absolute_path = global
-ij_javascript_import_sort_members = true
-ij_javascript_import_sort_module_name = false
-ij_javascript_import_use_node_resolution = true
-ij_javascript_imports_wrap = on_every_item
-ij_javascript_indent_case_from_switch = true
-ij_javascript_indent_chained_calls = true
-ij_javascript_indent_package_children = 0
-ij_javascript_jsx_attribute_value = braces
-ij_javascript_keep_blank_lines_in_code = 2
-ij_javascript_keep_first_column_comment = true
-ij_javascript_keep_indents_on_empty_lines = false
-ij_javascript_keep_line_breaks = true
-ij_javascript_keep_simple_blocks_in_one_line = false
-ij_javascript_keep_simple_methods_in_one_line = false
-ij_javascript_line_comment_add_space = true
-ij_javascript_line_comment_at_first_column = false
-ij_javascript_method_brace_style = end_of_line
-ij_javascript_method_call_chain_wrap = off
-ij_javascript_method_parameters_new_line_after_left_paren = false
-ij_javascript_method_parameters_right_paren_on_new_line = false
-ij_javascript_method_parameters_wrap = off
-ij_javascript_object_literal_wrap = on_every_item
-ij_javascript_parentheses_expression_new_line_after_left_paren = false
-ij_javascript_parentheses_expression_right_paren_on_new_line = false
-ij_javascript_place_assignment_sign_on_next_line = false
-ij_javascript_prefer_as_type_cast = false
-ij_javascript_prefer_explicit_types_function_expression_returns = false
-ij_javascript_prefer_explicit_types_function_returns = false
-ij_javascript_prefer_explicit_types_vars_fields = false
-ij_javascript_prefer_parameters_wrap = false
-ij_javascript_reformat_c_style_comments = false
-ij_javascript_space_after_colon = true
-ij_javascript_space_after_comma = true
-ij_javascript_space_after_dots_in_rest_parameter = false
-ij_javascript_space_after_generator_mult = true
-ij_javascript_space_after_property_colon = true
-ij_javascript_space_after_quest = true
-ij_javascript_space_after_type_colon = true
-ij_javascript_space_after_unary_not = false
-ij_javascript_space_before_async_arrow_lparen = true
-ij_javascript_space_before_catch_keyword = true
-ij_javascript_space_before_catch_left_brace = true
-ij_javascript_space_before_catch_parentheses = true
-ij_javascript_space_before_class_lbrace = true
-ij_javascript_space_before_class_left_brace = true
-ij_javascript_space_before_colon = true
-ij_javascript_space_before_comma = false
-ij_javascript_space_before_do_left_brace = true
-ij_javascript_space_before_else_keyword = true
-ij_javascript_space_before_else_left_brace = true
-ij_javascript_space_before_finally_keyword = true
-ij_javascript_space_before_finally_left_brace = true
-ij_javascript_space_before_for_left_brace = true
-ij_javascript_space_before_for_parentheses = true
-ij_javascript_space_before_for_semicolon = false
-ij_javascript_space_before_function_left_parenth = true
-ij_javascript_space_before_generator_mult = false
-ij_javascript_space_before_if_left_brace = true
-ij_javascript_space_before_if_parentheses = true
-ij_javascript_space_before_method_call_parentheses = false
-ij_javascript_space_before_method_left_brace = true
-ij_javascript_space_before_method_parentheses = false
-ij_javascript_space_before_property_colon = false
-ij_javascript_space_before_quest = true
-ij_javascript_space_before_switch_left_brace = true
-ij_javascript_space_before_switch_parentheses = true
-ij_javascript_space_before_try_left_brace = true
-ij_javascript_space_before_type_colon = false
-ij_javascript_space_before_unary_not = false
-ij_javascript_space_before_while_keyword = true
-ij_javascript_space_before_while_left_brace = true
-ij_javascript_space_before_while_parentheses = true
-ij_javascript_spaces_around_additive_operators = true
-ij_javascript_spaces_around_arrow_function_operator = true
-ij_javascript_spaces_around_assignment_operators = true
-ij_javascript_spaces_around_bitwise_operators = true
-ij_javascript_spaces_around_equality_operators = true
-ij_javascript_spaces_around_logical_operators = true
-ij_javascript_spaces_around_multiplicative_operators = true
-ij_javascript_spaces_around_relational_operators = true
-ij_javascript_spaces_around_shift_operators = true
-ij_javascript_spaces_around_unary_operator = false
-ij_javascript_spaces_within_array_initializer_brackets = false
-ij_javascript_spaces_within_brackets = false
-ij_javascript_spaces_within_catch_parentheses = false
-ij_javascript_spaces_within_for_parentheses = false
-ij_javascript_spaces_within_if_parentheses = false
-ij_javascript_spaces_within_imports = false
-ij_javascript_spaces_within_interpolation_expressions = false
-ij_javascript_spaces_within_method_call_parentheses = false
-ij_javascript_spaces_within_method_parentheses = false
-ij_javascript_spaces_within_object_literal_braces = false
-ij_javascript_spaces_within_object_type_braces = true
-ij_javascript_spaces_within_parentheses = false
-ij_javascript_spaces_within_switch_parentheses = false
-ij_javascript_spaces_within_type_assertion = false
-ij_javascript_spaces_within_union_types = true
-ij_javascript_spaces_within_while_parentheses = false
-ij_javascript_special_else_if_treatment = true
-ij_javascript_ternary_operation_signs_on_next_line = false
-ij_javascript_ternary_operation_wrap = off
-ij_javascript_union_types_wrap = on_every_item
-ij_javascript_use_chained_calls_group_indents = false
-ij_javascript_use_double_quotes = true
-ij_javascript_use_explicit_js_extension = global
-ij_javascript_use_path_mapping = always
-ij_javascript_use_public_modifier = false
-ij_javascript_use_semicolon_after_statement = true
-ij_javascript_var_declaration_wrap = normal
-ij_javascript_while_brace_force = never
-ij_javascript_while_on_new_line = false
-ij_javascript_wrap_comments = false
-
-[{*.cjsx,*.coffee}]
-indent_size = 2
-tab_width = 2
-ij_continuation_indent_size = 2
-ij_coffeescript_align_function_body = false
-ij_coffeescript_align_imports = false
-ij_coffeescript_align_multiline_array_initializer_expression = true
-ij_coffeescript_align_multiline_parameters = true
-ij_coffeescript_align_multiline_parameters_in_calls = false
-ij_coffeescript_align_object_properties = 0
-ij_coffeescript_align_union_types = false
-ij_coffeescript_align_var_statements = 0
-ij_coffeescript_array_initializer_new_line_after_left_brace = false
-ij_coffeescript_array_initializer_right_brace_on_new_line = false
-ij_coffeescript_array_initializer_wrap = normal
-ij_coffeescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
-ij_coffeescript_blank_lines_around_function = 1
-ij_coffeescript_call_parameters_new_line_after_left_paren = false
-ij_coffeescript_call_parameters_right_paren_on_new_line = false
-ij_coffeescript_call_parameters_wrap = normal
-ij_coffeescript_chained_call_dot_on_new_line = true
-ij_coffeescript_comma_on_new_line = false
-ij_coffeescript_enforce_trailing_comma = keep
-ij_coffeescript_field_prefix = _
-ij_coffeescript_file_name_style = relaxed
-ij_coffeescript_force_quote_style = false
-ij_coffeescript_force_semicolon_style = false
-ij_coffeescript_function_expression_brace_style = end_of_line
-ij_coffeescript_import_merge_members = global
-ij_coffeescript_import_prefer_absolute_path = global
-ij_coffeescript_import_sort_members = true
-ij_coffeescript_import_sort_module_name = false
-ij_coffeescript_import_use_node_resolution = true
-ij_coffeescript_imports_wrap = on_every_item
-ij_coffeescript_indent_chained_calls = true
-ij_coffeescript_indent_package_children = 0
-ij_coffeescript_jsx_attribute_value = braces
-ij_coffeescript_keep_blank_lines_in_code = 2
-ij_coffeescript_keep_first_column_comment = true
-ij_coffeescript_keep_indents_on_empty_lines = false
-ij_coffeescript_keep_line_breaks = true
-ij_coffeescript_keep_simple_methods_in_one_line = false
-ij_coffeescript_method_parameters_new_line_after_left_paren = false
-ij_coffeescript_method_parameters_right_paren_on_new_line = false
-ij_coffeescript_method_parameters_wrap = off
-ij_coffeescript_object_literal_wrap = on_every_item
-ij_coffeescript_prefer_as_type_cast = false
-ij_coffeescript_prefer_explicit_types_function_expression_returns = false
-ij_coffeescript_prefer_explicit_types_function_returns = false
-ij_coffeescript_prefer_explicit_types_vars_fields = false
-ij_coffeescript_reformat_c_style_comments = false
-ij_coffeescript_space_after_comma = true
-ij_coffeescript_space_after_dots_in_rest_parameter = false
-ij_coffeescript_space_after_generator_mult = true
-ij_coffeescript_space_after_property_colon = true
-ij_coffeescript_space_after_type_colon = true
-ij_coffeescript_space_after_unary_not = false
-ij_coffeescript_space_before_async_arrow_lparen = true
-ij_coffeescript_space_before_class_lbrace = true
-ij_coffeescript_space_before_comma = false
-ij_coffeescript_space_before_function_left_parenth = true
-ij_coffeescript_space_before_generator_mult = false
-ij_coffeescript_space_before_property_colon = false
-ij_coffeescript_space_before_type_colon = false
-ij_coffeescript_space_before_unary_not = false
-ij_coffeescript_spaces_around_additive_operators = true
-ij_coffeescript_spaces_around_arrow_function_operator = true
-ij_coffeescript_spaces_around_assignment_operators = true
-ij_coffeescript_spaces_around_bitwise_operators = true
-ij_coffeescript_spaces_around_equality_operators = true
-ij_coffeescript_spaces_around_logical_operators = true
-ij_coffeescript_spaces_around_multiplicative_operators = true
-ij_coffeescript_spaces_around_relational_operators = true
-ij_coffeescript_spaces_around_shift_operators = true
-ij_coffeescript_spaces_around_unary_operator = false
-ij_coffeescript_spaces_within_array_initializer_braces = false
-ij_coffeescript_spaces_within_array_initializer_brackets = false
-ij_coffeescript_spaces_within_imports = false
-ij_coffeescript_spaces_within_index_brackets = false
-ij_coffeescript_spaces_within_interpolation_expressions = false
-ij_coffeescript_spaces_within_method_call_parentheses = false
-ij_coffeescript_spaces_within_method_parentheses = false
-ij_coffeescript_spaces_within_object_braces = false
-ij_coffeescript_spaces_within_object_literal_braces = false
-ij_coffeescript_spaces_within_object_type_braces = true
-ij_coffeescript_spaces_within_range_brackets = false
-ij_coffeescript_spaces_within_type_assertion = false
-ij_coffeescript_spaces_within_union_types = true
-ij_coffeescript_union_types_wrap = on_every_item
-ij_coffeescript_use_chained_calls_group_indents = false
-ij_coffeescript_use_double_quotes = true
-ij_coffeescript_use_explicit_js_extension = global
-ij_coffeescript_use_path_mapping = always
-ij_coffeescript_use_public_modifier = false
-ij_coffeescript_use_semicolon_after_statement = false
-ij_coffeescript_var_declaration_wrap = normal
-
-[{*.ft,*.vm,*.vsl}]
-ij_vtl_keep_indents_on_empty_lines = false
-
-[{*.gant,*.gradle,*.groovy,*.gy}]
-ij_groovy_align_group_field_declarations = false
-ij_groovy_align_multiline_array_initializer_expression = false
-ij_groovy_align_multiline_assignment = false
-ij_groovy_align_multiline_binary_operation = false
-ij_groovy_align_multiline_chained_methods = false
-ij_groovy_align_multiline_extends_list = false
-ij_groovy_align_multiline_for = true
-ij_groovy_align_multiline_list_or_map = true
-ij_groovy_align_multiline_method_parentheses = false
-ij_groovy_align_multiline_parameters = true
-ij_groovy_align_multiline_parameters_in_calls = false
-ij_groovy_align_multiline_resources = true
-ij_groovy_align_multiline_ternary_operation = false
-ij_groovy_align_multiline_throws_list = false
-ij_groovy_align_named_args_in_map = true
-ij_groovy_align_throws_keyword = false
-ij_groovy_array_initializer_new_line_after_left_brace = false
-ij_groovy_array_initializer_right_brace_on_new_line = false
-ij_groovy_array_initializer_wrap = off
-ij_groovy_assert_statement_wrap = off
-ij_groovy_assignment_wrap = off
-ij_groovy_binary_operation_wrap = off
-ij_groovy_blank_lines_after_class_header = 0
-ij_groovy_blank_lines_after_imports = 1
-ij_groovy_blank_lines_after_package = 1
-ij_groovy_blank_lines_around_class = 1
-ij_groovy_blank_lines_around_field = 0
-ij_groovy_blank_lines_around_field_in_interface = 0
-ij_groovy_blank_lines_around_method = 1
-ij_groovy_blank_lines_around_method_in_interface = 1
-ij_groovy_blank_lines_before_imports = 1
-ij_groovy_blank_lines_before_method_body = 0
-ij_groovy_blank_lines_before_package = 0
-ij_groovy_block_brace_style = end_of_line
-ij_groovy_block_comment_at_first_column = true
-ij_groovy_call_parameters_new_line_after_left_paren = false
-ij_groovy_call_parameters_right_paren_on_new_line = false
-ij_groovy_call_parameters_wrap = off
-ij_groovy_catch_on_new_line = false
-ij_groovy_class_annotation_wrap = split_into_lines
-ij_groovy_class_brace_style = end_of_line
-ij_groovy_class_count_to_use_import_on_demand = 5
-ij_groovy_do_while_brace_force = never
-ij_groovy_else_on_new_line = false
-ij_groovy_enum_constants_wrap = off
-ij_groovy_extends_keyword_wrap = off
-ij_groovy_extends_list_wrap = off
-ij_groovy_field_annotation_wrap = split_into_lines
-ij_groovy_finally_on_new_line = false
-ij_groovy_for_brace_force = never
-ij_groovy_for_statement_new_line_after_left_paren = false
-ij_groovy_for_statement_right_paren_on_new_line = false
-ij_groovy_for_statement_wrap = off
-ij_groovy_if_brace_force = never
-ij_groovy_import_annotation_wrap = 2
-ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
-ij_groovy_indent_case_from_switch = true
-ij_groovy_indent_label_blocks = true
-ij_groovy_insert_inner_class_imports = false
-ij_groovy_keep_blank_lines_before_right_brace = 2
-ij_groovy_keep_blank_lines_in_code = 2
-ij_groovy_keep_blank_lines_in_declarations = 2
-ij_groovy_keep_control_statement_in_one_line = true
-ij_groovy_keep_first_column_comment = true
-ij_groovy_keep_indents_on_empty_lines = false
-ij_groovy_keep_line_breaks = true
-ij_groovy_keep_multiple_expressions_in_one_line = false
-ij_groovy_keep_simple_blocks_in_one_line = false
-ij_groovy_keep_simple_classes_in_one_line = true
-ij_groovy_keep_simple_lambdas_in_one_line = true
-ij_groovy_keep_simple_methods_in_one_line = true
-ij_groovy_label_indent_absolute = false
-ij_groovy_label_indent_size = 0
-ij_groovy_lambda_brace_style = end_of_line
-ij_groovy_layout_static_imports_separately = true
-ij_groovy_line_comment_add_space = false
-ij_groovy_line_comment_at_first_column = true
-ij_groovy_method_annotation_wrap = split_into_lines
-ij_groovy_method_brace_style = end_of_line
-ij_groovy_method_call_chain_wrap = off
-ij_groovy_method_parameters_new_line_after_left_paren = false
-ij_groovy_method_parameters_right_paren_on_new_line = false
-ij_groovy_method_parameters_wrap = off
-ij_groovy_modifier_list_wrap = false
-ij_groovy_names_count_to_use_import_on_demand = 3
-ij_groovy_parameter_annotation_wrap = off
-ij_groovy_parentheses_expression_new_line_after_left_paren = false
-ij_groovy_parentheses_expression_right_paren_on_new_line = false
-ij_groovy_prefer_parameters_wrap = false
-ij_groovy_resource_list_new_line_after_left_paren = false
-ij_groovy_resource_list_right_paren_on_new_line = false
-ij_groovy_resource_list_wrap = off
-ij_groovy_space_after_assert_separator = true
-ij_groovy_space_after_colon = true
-ij_groovy_space_after_comma = true
-ij_groovy_space_after_comma_in_type_arguments = true
-ij_groovy_space_after_for_semicolon = true
-ij_groovy_space_after_quest = true
-ij_groovy_space_after_type_cast = true
-ij_groovy_space_before_annotation_parameter_list = false
-ij_groovy_space_before_array_initializer_left_brace = false
-ij_groovy_space_before_assert_separator = false
-ij_groovy_space_before_catch_keyword = true
-ij_groovy_space_before_catch_left_brace = true
-ij_groovy_space_before_catch_parentheses = true
-ij_groovy_space_before_class_left_brace = true
-ij_groovy_space_before_closure_left_brace = true
-ij_groovy_space_before_colon = true
-ij_groovy_space_before_comma = false
-ij_groovy_space_before_do_left_brace = true
-ij_groovy_space_before_else_keyword = true
-ij_groovy_space_before_else_left_brace = true
-ij_groovy_space_before_finally_keyword = true
-ij_groovy_space_before_finally_left_brace = true
-ij_groovy_space_before_for_left_brace = true
-ij_groovy_space_before_for_parentheses = true
-ij_groovy_space_before_for_semicolon = false
-ij_groovy_space_before_if_left_brace = true
-ij_groovy_space_before_if_parentheses = true
-ij_groovy_space_before_method_call_parentheses = false
-ij_groovy_space_before_method_left_brace = true
-ij_groovy_space_before_method_parentheses = false
-ij_groovy_space_before_quest = true
-ij_groovy_space_before_switch_left_brace = true
-ij_groovy_space_before_switch_parentheses = true
-ij_groovy_space_before_synchronized_left_brace = true
-ij_groovy_space_before_synchronized_parentheses = true
-ij_groovy_space_before_try_left_brace = true
-ij_groovy_space_before_try_parentheses = true
-ij_groovy_space_before_while_keyword = true
-ij_groovy_space_before_while_left_brace = true
-ij_groovy_space_before_while_parentheses = true
-ij_groovy_space_in_named_argument = true
-ij_groovy_space_in_named_argument_before_colon = false
-ij_groovy_space_within_empty_array_initializer_braces = false
-ij_groovy_space_within_empty_method_call_parentheses = false
-ij_groovy_spaces_around_additive_operators = true
-ij_groovy_spaces_around_assignment_operators = true
-ij_groovy_spaces_around_bitwise_operators = true
-ij_groovy_spaces_around_equality_operators = true
-ij_groovy_spaces_around_lambda_arrow = true
-ij_groovy_spaces_around_logical_operators = true
-ij_groovy_spaces_around_multiplicative_operators = true
-ij_groovy_spaces_around_regex_operators = true
-ij_groovy_spaces_around_relational_operators = true
-ij_groovy_spaces_around_shift_operators = true
-ij_groovy_spaces_within_annotation_parentheses = false
-ij_groovy_spaces_within_array_initializer_braces = false
-ij_groovy_spaces_within_braces = true
-ij_groovy_spaces_within_brackets = false
-ij_groovy_spaces_within_cast_parentheses = false
-ij_groovy_spaces_within_catch_parentheses = false
-ij_groovy_spaces_within_for_parentheses = false
-ij_groovy_spaces_within_gstring_injection_braces = false
-ij_groovy_spaces_within_if_parentheses = false
-ij_groovy_spaces_within_list_or_map = false
-ij_groovy_spaces_within_method_call_parentheses = false
-ij_groovy_spaces_within_method_parentheses = false
-ij_groovy_spaces_within_parentheses = false
-ij_groovy_spaces_within_switch_parentheses = false
-ij_groovy_spaces_within_synchronized_parentheses = false
-ij_groovy_spaces_within_try_parentheses = false
-ij_groovy_spaces_within_tuple_expression = false
-ij_groovy_spaces_within_while_parentheses = false
-ij_groovy_special_else_if_treatment = true
-ij_groovy_ternary_operation_wrap = off
-ij_groovy_throws_keyword_wrap = off
-ij_groovy_throws_list_wrap = off
-ij_groovy_use_flying_geese_braces = false
-ij_groovy_use_fq_class_names = false
-ij_groovy_use_fq_class_names_in_javadoc = true
-ij_groovy_use_relative_indents = false
-ij_groovy_use_single_class_imports = true
-ij_groovy_variable_annotation_wrap = off
-ij_groovy_while_brace_force = never
-ij_groovy_while_on_new_line = false
-ij_groovy_wrap_long_lines = false
-
-[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
-ij_kotlin_align_in_columns_case_branch = false
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_allow_trailing_comma = false
-ij_kotlin_allow_trailing_comma_on_call_site = false
-ij_kotlin_assignment_wrap = normal
-ij_kotlin_blank_lines_after_class_header = 0
-ij_kotlin_blank_lines_around_block_when_branches = 0
-ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = true
-ij_kotlin_call_parameters_right_paren_on_new_line = true
-ij_kotlin_call_parameters_wrap = on_every_item
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_class_annotation_wrap = split_into_lines
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-ij_kotlin_continuation_indent_for_chained_calls = false
-ij_kotlin_continuation_indent_for_expression_bodies = false
-ij_kotlin_continuation_indent_in_argument_lists = false
-ij_kotlin_continuation_indent_in_elvis = false
-ij_kotlin_continuation_indent_in_if_conditions = false
-ij_kotlin_continuation_indent_in_parameter_lists = false
-ij_kotlin_continuation_indent_in_supertype_lists = false
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = normal
-ij_kotlin_field_annotation_wrap = split_into_lines
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = true
-ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 2
-ij_kotlin_keep_blank_lines_in_code = 2
-ij_kotlin_keep_blank_lines_in_declarations = 2
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = normal
-ij_kotlin_method_parameters_new_line_after_left_paren = true
-ij_kotlin_method_parameters_right_paren_on_new_line = true
-ij_kotlin_method_parameters_wrap = on_every_item
-ij_kotlin_name_count_to_use_star_import = 5
-ij_kotlin_name_count_to_use_star_import_for_members = 3
-ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 1
-ij_kotlin_wrap_first_method_in_call_chain = false
-
-[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config,mcmod.info,pack.mcmeta}]
-indent_size = 2
-ij_json_keep_blank_lines_in_code = 0
-ij_json_keep_indents_on_empty_lines = false
-ij_json_keep_line_breaks = true
-ij_json_space_after_colon = true
-ij_json_space_after_comma = true
-ij_json_space_before_colon = true
-ij_json_space_before_comma = false
-ij_json_spaces_within_braces = false
-ij_json_spaces_within_brackets = false
-ij_json_wrap_long_lines = false
-
-[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}]
-ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-ij_html_align_attributes = true
-ij_html_align_text = false
-ij_html_attribute_wrap = normal
-ij_html_block_comment_at_first_column = true
-ij_html_do_not_align_children_of_min_lines = 0
-ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
-ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
-ij_html_enforce_quotes = false
-ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
-ij_html_keep_blank_lines = 2
-ij_html_keep_indents_on_empty_lines = false
-ij_html_keep_line_breaks = true
-ij_html_keep_line_breaks_in_text = true
-ij_html_keep_whitespaces = false
-ij_html_keep_whitespaces_inside = span,pre,textarea
-ij_html_line_comment_at_first_column = true
-ij_html_new_line_after_last_attribute = never
-ij_html_new_line_before_first_attribute = never
-ij_html_quote_style = double
-ij_html_remove_new_line_before_tags = br
-ij_html_space_after_tag_name = false
-ij_html_space_around_equality_in_attribute = false
-ij_html_space_inside_empty_tag = false
-ij_html_text_wrap = normal
-ij_html_uniform_ident = false
-
-[{*.jsf,*.jsp,*.jspf,*.tag,*.tagf,*.xjsp}]
-ij_jsp_jsp_prefer_comma_separated_import_list = false
-ij_jsp_keep_indents_on_empty_lines = false
-
-[{*.jspx,*.tagx}]
-ij_jspx_keep_indents_on_empty_lines = false
-
-[{*.markdown,*.md}]
-ij_markdown_force_one_space_after_blockquote_symbol = true
-ij_markdown_force_one_space_after_header_symbol = true
-ij_markdown_force_one_space_after_list_bullet = true
-ij_markdown_force_one_space_between_words = true
-ij_markdown_keep_indents_on_empty_lines = false
-ij_markdown_max_lines_around_block_elements = 1
-ij_markdown_max_lines_around_header = 1
-ij_markdown_max_lines_between_paragraphs = 1
-ij_markdown_min_lines_around_block_elements = 1
-ij_markdown_min_lines_around_header = 1
-ij_markdown_min_lines_between_paragraphs = 1
-
-[{*.properties,spring.handlers,spring.schemas}]
-ij_properties_align_group_field_declarations = false
-ij_properties_keep_blank_lines = false
-ij_properties_key_value_delimiter = equals
-ij_properties_spaces_around_key_value_delimiter = false
-
-[{*.yaml,*.yml}]
-indent_size = 2
-ij_yaml_align_values_properties = do_not_align
-ij_yaml_autoinsert_sequence_marker = true
-ij_yaml_block_mapping_on_new_line = false
-ij_yaml_indent_sequence_value = true
-ij_yaml_keep_indents_on_empty_lines = false
-ij_yaml_keep_line_breaks = true
-ij_yaml_sequence_on_new_line = false
-ij_yaml_space_before_colon = false
-ij_yaml_spaces_within_braces = true
-ij_yaml_spaces_within_brackets = true
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 120
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_smart_tabs = false
+ij_visual_guides = none
+ij_wrap_on_typing = false
+
+[*.css]
+ij_css_align_closing_brace_with_properties = false
+ij_css_blank_lines_around_nested_selector = 1
+ij_css_blank_lines_between_blocks = 1
+ij_css_brace_placement = end_of_line
+ij_css_enforce_quotes_on_format = false
+ij_css_hex_color_long_format = false
+ij_css_hex_color_lower_case = false
+ij_css_hex_color_short_format = false
+ij_css_hex_color_upper_case = false
+ij_css_keep_blank_lines_in_code = 2
+ij_css_keep_indents_on_empty_lines = false
+ij_css_keep_single_line_blocks = false
+ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_css_space_after_colon = true
+ij_css_space_before_opening_brace = true
+ij_css_use_double_quotes = true
+ij_css_value_alignment = do_not_align
+
+[*.feature]
+indent_size = 2
+ij_gherkin_keep_indents_on_empty_lines = false
+
+[*.haml]
+indent_size = 2
+ij_haml_keep_indents_on_empty_lines = false
+
+[*.java]
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = true
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = off
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 1
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_at_first_column = true
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = false
+ij_java_call_parameters_wrap = off
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = end_of_line
+ij_java_class_count_to_use_import_on_demand = 2
+ij_java_class_names_in_javadoc = 1
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_while_brace_force = never
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_entity_dd_suffix = EJB
+ij_java_entity_eb_suffix = Bean
+ij_java_entity_hi_suffix = Home
+ij_java_entity_lhi_prefix = Local
+ij_java_entity_lhi_suffix = Home
+ij_java_entity_li_prefix = Local
+ij_java_entity_pk_class = java.lang.String
+ij_java_entity_vo_suffix = VO
+ij_java_enum_constants_wrap = off
+ij_java_extends_keyword_wrap = off
+ij_java_extends_list_wrap = off
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = never
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_if_brace_force = never
+ij_java_imports_layout = *,|,javax.**,java.**,|,$*
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = true
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_at_first_column = true
+ij_java_message_dd_suffix = EJB
+ij_java_message_eb_suffix = Bean
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = off
+ij_java_method_parameters_new_line_after_left_paren = false
+ij_java_method_parameters_right_paren_on_new_line = false
+ij_java_method_parameters_wrap = off
+ij_java_modifier_list_wrap = false
+ij_java_names_count_to_use_import_on_demand = 3
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
+ij_java_parameter_annotation_wrap = off
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_record_header = false
+ij_java_session_dd_suffix = EJB
+ij_java_session_eb_suffix = Bean
+ij_java_session_hi_suffix = Home
+ij_java_session_lhi_prefix = Local
+ij_java_session_lhi_suffix = Home
+ij_java_session_li_prefix = Local
+ij_java_session_si_suffix = Service
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = false
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = false
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = false
+ij_java_ternary_operation_wrap = off
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = off
+ij_java_throws_list_wrap = off
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = never
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false
+
+[*.less]
+indent_size = 2
+ij_less_align_closing_brace_with_properties = false
+ij_less_blank_lines_around_nested_selector = 1
+ij_less_blank_lines_between_blocks = 1
+ij_less_brace_placement = 0
+ij_less_enforce_quotes_on_format = false
+ij_less_hex_color_long_format = false
+ij_less_hex_color_lower_case = false
+ij_less_hex_color_short_format = false
+ij_less_hex_color_upper_case = false
+ij_less_keep_blank_lines_in_code = 2
+ij_less_keep_indents_on_empty_lines = false
+ij_less_keep_single_line_blocks = false
+ij_less_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_less_space_after_colon = true
+ij_less_space_before_opening_brace = true
+ij_less_use_double_quotes = true
+ij_less_value_alignment = 0
+
+[*.nbtt]
+max_line_length = 150
+ij_continuation_indent_size = 4
+ij_nbtt_keep_indents_on_empty_lines = false
+ij_nbtt_space_after_colon = true
+ij_nbtt_space_after_comma = true
+ij_nbtt_space_before_colon = true
+ij_nbtt_space_before_comma = false
+ij_nbtt_spaces_within_brackets = false
+ij_nbtt_spaces_within_parentheses = false
+
+[*.sass]
+indent_size = 2
+ij_sass_align_closing_brace_with_properties = false
+ij_sass_blank_lines_around_nested_selector = 1
+ij_sass_blank_lines_between_blocks = 1
+ij_sass_brace_placement = 0
+ij_sass_enforce_quotes_on_format = false
+ij_sass_hex_color_long_format = false
+ij_sass_hex_color_lower_case = false
+ij_sass_hex_color_short_format = false
+ij_sass_hex_color_upper_case = false
+ij_sass_keep_blank_lines_in_code = 2
+ij_sass_keep_indents_on_empty_lines = false
+ij_sass_keep_single_line_blocks = false
+ij_sass_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_sass_space_after_colon = true
+ij_sass_space_before_opening_brace = true
+ij_sass_use_double_quotes = true
+ij_sass_value_alignment = 0
+
+[*.scss]
+indent_size = 2
+ij_scss_align_closing_brace_with_properties = false
+ij_scss_blank_lines_around_nested_selector = 1
+ij_scss_blank_lines_between_blocks = 1
+ij_scss_brace_placement = 0
+ij_scss_enforce_quotes_on_format = false
+ij_scss_hex_color_long_format = false
+ij_scss_hex_color_lower_case = false
+ij_scss_hex_color_short_format = false
+ij_scss_hex_color_upper_case = false
+ij_scss_keep_blank_lines_in_code = 2
+ij_scss_keep_indents_on_empty_lines = false
+ij_scss_keep_single_line_blocks = false
+ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_scss_space_after_colon = true
+ij_scss_space_before_opening_brace = true
+ij_scss_use_double_quotes = true
+ij_scss_value_alignment = 0
+
+[*.styl]
+indent_size = 2
+ij_stylus_align_closing_brace_with_properties = false
+ij_stylus_blank_lines_around_nested_selector = 1
+ij_stylus_blank_lines_between_blocks = 1
+ij_stylus_brace_placement = 0
+ij_stylus_enforce_quotes_on_format = false
+ij_stylus_hex_color_long_format = false
+ij_stylus_hex_color_lower_case = false
+ij_stylus_hex_color_short_format = false
+ij_stylus_hex_color_upper_case = false
+ij_stylus_keep_blank_lines_in_code = 2
+ij_stylus_keep_indents_on_empty_lines = false
+ij_stylus_keep_single_line_blocks = false
+ij_stylus_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_stylus_space_after_colon = true
+ij_stylus_space_before_opening_brace = true
+ij_stylus_use_double_quotes = true
+ij_stylus_value_alignment = 0
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.pom,*.rng,*.tld,*.wadl,*.wsdd,*.wsdl,*.xjb,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+ij_xml_align_attributes = true
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = true
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = false
+ij_xml_text_wrap = normal
+
+[{*.ats,*.ts}]
+ij_continuation_indent_size = 4
+ij_typescript_align_imports = false
+ij_typescript_align_multiline_array_initializer_expression = false
+ij_typescript_align_multiline_binary_operation = false
+ij_typescript_align_multiline_chained_methods = false
+ij_typescript_align_multiline_extends_list = false
+ij_typescript_align_multiline_for = true
+ij_typescript_align_multiline_parameters = true
+ij_typescript_align_multiline_parameters_in_calls = false
+ij_typescript_align_multiline_ternary_operation = false
+ij_typescript_align_object_properties = 0
+ij_typescript_align_union_types = false
+ij_typescript_align_var_statements = 0
+ij_typescript_array_initializer_new_line_after_left_brace = false
+ij_typescript_array_initializer_right_brace_on_new_line = false
+ij_typescript_array_initializer_wrap = off
+ij_typescript_assignment_wrap = off
+ij_typescript_binary_operation_sign_on_next_line = false
+ij_typescript_binary_operation_wrap = off
+ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
+ij_typescript_blank_lines_after_imports = 1
+ij_typescript_blank_lines_around_class = 1
+ij_typescript_blank_lines_around_field = 0
+ij_typescript_blank_lines_around_field_in_interface = 0
+ij_typescript_blank_lines_around_function = 1
+ij_typescript_blank_lines_around_method = 1
+ij_typescript_blank_lines_around_method_in_interface = 1
+ij_typescript_block_brace_style = end_of_line
+ij_typescript_call_parameters_new_line_after_left_paren = false
+ij_typescript_call_parameters_right_paren_on_new_line = false
+ij_typescript_call_parameters_wrap = off
+ij_typescript_catch_on_new_line = false
+ij_typescript_chained_call_dot_on_new_line = true
+ij_typescript_class_brace_style = end_of_line
+ij_typescript_comma_on_new_line = false
+ij_typescript_do_while_brace_force = never
+ij_typescript_else_on_new_line = false
+ij_typescript_enforce_trailing_comma = keep
+ij_typescript_extends_keyword_wrap = off
+ij_typescript_extends_list_wrap = off
+ij_typescript_field_prefix = _
+ij_typescript_file_name_style = relaxed
+ij_typescript_finally_on_new_line = false
+ij_typescript_for_brace_force = never
+ij_typescript_for_statement_new_line_after_left_paren = false
+ij_typescript_for_statement_right_paren_on_new_line = false
+ij_typescript_for_statement_wrap = off
+ij_typescript_force_quote_style = false
+ij_typescript_force_semicolon_style = false
+ij_typescript_function_expression_brace_style = end_of_line
+ij_typescript_if_brace_force = never
+ij_typescript_import_merge_members = global
+ij_typescript_import_prefer_absolute_path = global
+ij_typescript_import_sort_members = true
+ij_typescript_import_sort_module_name = false
+ij_typescript_import_use_node_resolution = true
+ij_typescript_imports_wrap = on_every_item
+ij_typescript_indent_case_from_switch = true
+ij_typescript_indent_chained_calls = true
+ij_typescript_indent_package_children = 0
+ij_typescript_jsdoc_include_types = false
+ij_typescript_jsx_attribute_value = braces
+ij_typescript_keep_blank_lines_in_code = 2
+ij_typescript_keep_first_column_comment = true
+ij_typescript_keep_indents_on_empty_lines = false
+ij_typescript_keep_line_breaks = true
+ij_typescript_keep_simple_blocks_in_one_line = false
+ij_typescript_keep_simple_methods_in_one_line = false
+ij_typescript_line_comment_add_space = true
+ij_typescript_line_comment_at_first_column = false
+ij_typescript_method_brace_style = end_of_line
+ij_typescript_method_call_chain_wrap = off
+ij_typescript_method_parameters_new_line_after_left_paren = false
+ij_typescript_method_parameters_right_paren_on_new_line = false
+ij_typescript_method_parameters_wrap = off
+ij_typescript_object_literal_wrap = on_every_item
+ij_typescript_parentheses_expression_new_line_after_left_paren = false
+ij_typescript_parentheses_expression_right_paren_on_new_line = false
+ij_typescript_place_assignment_sign_on_next_line = false
+ij_typescript_prefer_as_type_cast = false
+ij_typescript_prefer_explicit_types_function_expression_returns = false
+ij_typescript_prefer_explicit_types_function_returns = false
+ij_typescript_prefer_explicit_types_vars_fields = false
+ij_typescript_prefer_parameters_wrap = false
+ij_typescript_reformat_c_style_comments = false
+ij_typescript_space_after_colon = true
+ij_typescript_space_after_comma = true
+ij_typescript_space_after_dots_in_rest_parameter = false
+ij_typescript_space_after_generator_mult = true
+ij_typescript_space_after_property_colon = true
+ij_typescript_space_after_quest = true
+ij_typescript_space_after_type_colon = true
+ij_typescript_space_after_unary_not = false
+ij_typescript_space_before_async_arrow_lparen = true
+ij_typescript_space_before_catch_keyword = true
+ij_typescript_space_before_catch_left_brace = true
+ij_typescript_space_before_catch_parentheses = true
+ij_typescript_space_before_class_lbrace = true
+ij_typescript_space_before_class_left_brace = true
+ij_typescript_space_before_colon = true
+ij_typescript_space_before_comma = false
+ij_typescript_space_before_do_left_brace = true
+ij_typescript_space_before_else_keyword = true
+ij_typescript_space_before_else_left_brace = true
+ij_typescript_space_before_finally_keyword = true
+ij_typescript_space_before_finally_left_brace = true
+ij_typescript_space_before_for_left_brace = true
+ij_typescript_space_before_for_parentheses = true
+ij_typescript_space_before_for_semicolon = false
+ij_typescript_space_before_function_left_parenth = true
+ij_typescript_space_before_generator_mult = false
+ij_typescript_space_before_if_left_brace = true
+ij_typescript_space_before_if_parentheses = true
+ij_typescript_space_before_method_call_parentheses = false
+ij_typescript_space_before_method_left_brace = true
+ij_typescript_space_before_method_parentheses = false
+ij_typescript_space_before_property_colon = false
+ij_typescript_space_before_quest = true
+ij_typescript_space_before_switch_left_brace = true
+ij_typescript_space_before_switch_parentheses = true
+ij_typescript_space_before_try_left_brace = true
+ij_typescript_space_before_type_colon = false
+ij_typescript_space_before_unary_not = false
+ij_typescript_space_before_while_keyword = true
+ij_typescript_space_before_while_left_brace = true
+ij_typescript_space_before_while_parentheses = true
+ij_typescript_spaces_around_additive_operators = true
+ij_typescript_spaces_around_arrow_function_operator = true
+ij_typescript_spaces_around_assignment_operators = true
+ij_typescript_spaces_around_bitwise_operators = true
+ij_typescript_spaces_around_equality_operators = true
+ij_typescript_spaces_around_logical_operators = true
+ij_typescript_spaces_around_multiplicative_operators = true
+ij_typescript_spaces_around_relational_operators = true
+ij_typescript_spaces_around_shift_operators = true
+ij_typescript_spaces_around_unary_operator = false
+ij_typescript_spaces_within_array_initializer_brackets = false
+ij_typescript_spaces_within_brackets = false
+ij_typescript_spaces_within_catch_parentheses = false
+ij_typescript_spaces_within_for_parentheses = false
+ij_typescript_spaces_within_if_parentheses = false
+ij_typescript_spaces_within_imports = false
+ij_typescript_spaces_within_interpolation_expressions = false
+ij_typescript_spaces_within_method_call_parentheses = false
+ij_typescript_spaces_within_method_parentheses = false
+ij_typescript_spaces_within_object_literal_braces = false
+ij_typescript_spaces_within_object_type_braces = true
+ij_typescript_spaces_within_parentheses = false
+ij_typescript_spaces_within_switch_parentheses = false
+ij_typescript_spaces_within_type_assertion = false
+ij_typescript_spaces_within_union_types = true
+ij_typescript_spaces_within_while_parentheses = false
+ij_typescript_special_else_if_treatment = true
+ij_typescript_ternary_operation_signs_on_next_line = false
+ij_typescript_ternary_operation_wrap = off
+ij_typescript_union_types_wrap = on_every_item
+ij_typescript_use_chained_calls_group_indents = false
+ij_typescript_use_double_quotes = true
+ij_typescript_use_explicit_js_extension = global
+ij_typescript_use_path_mapping = always
+ij_typescript_use_public_modifier = false
+ij_typescript_use_semicolon_after_statement = true
+ij_typescript_var_declaration_wrap = normal
+ij_typescript_while_brace_force = never
+ij_typescript_while_on_new_line = false
+ij_typescript_wrap_comments = false
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+
+[{*.cjs,*.js}]
+ij_continuation_indent_size = 4
+ij_javascript_align_imports = false
+ij_javascript_align_multiline_array_initializer_expression = false
+ij_javascript_align_multiline_binary_operation = false
+ij_javascript_align_multiline_chained_methods = false
+ij_javascript_align_multiline_extends_list = false
+ij_javascript_align_multiline_for = true
+ij_javascript_align_multiline_parameters = true
+ij_javascript_align_multiline_parameters_in_calls = false
+ij_javascript_align_multiline_ternary_operation = false
+ij_javascript_align_object_properties = 0
+ij_javascript_align_union_types = false
+ij_javascript_align_var_statements = 0
+ij_javascript_array_initializer_new_line_after_left_brace = false
+ij_javascript_array_initializer_right_brace_on_new_line = false
+ij_javascript_array_initializer_wrap = off
+ij_javascript_assignment_wrap = off
+ij_javascript_binary_operation_sign_on_next_line = false
+ij_javascript_binary_operation_wrap = off
+ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
+ij_javascript_blank_lines_after_imports = 1
+ij_javascript_blank_lines_around_class = 1
+ij_javascript_blank_lines_around_field = 0
+ij_javascript_blank_lines_around_function = 1
+ij_javascript_blank_lines_around_method = 1
+ij_javascript_block_brace_style = end_of_line
+ij_javascript_call_parameters_new_line_after_left_paren = false
+ij_javascript_call_parameters_right_paren_on_new_line = false
+ij_javascript_call_parameters_wrap = off
+ij_javascript_catch_on_new_line = false
+ij_javascript_chained_call_dot_on_new_line = true
+ij_javascript_class_brace_style = end_of_line
+ij_javascript_comma_on_new_line = false
+ij_javascript_do_while_brace_force = never
+ij_javascript_else_on_new_line = false
+ij_javascript_enforce_trailing_comma = keep
+ij_javascript_extends_keyword_wrap = off
+ij_javascript_extends_list_wrap = off
+ij_javascript_field_prefix = _
+ij_javascript_file_name_style = relaxed
+ij_javascript_finally_on_new_line = false
+ij_javascript_for_brace_force = never
+ij_javascript_for_statement_new_line_after_left_paren = false
+ij_javascript_for_statement_right_paren_on_new_line = false
+ij_javascript_for_statement_wrap = off
+ij_javascript_force_quote_style = false
+ij_javascript_force_semicolon_style = false
+ij_javascript_function_expression_brace_style = end_of_line
+ij_javascript_if_brace_force = never
+ij_javascript_import_merge_members = global
+ij_javascript_import_prefer_absolute_path = global
+ij_javascript_import_sort_members = true
+ij_javascript_import_sort_module_name = false
+ij_javascript_import_use_node_resolution = true
+ij_javascript_imports_wrap = on_every_item
+ij_javascript_indent_case_from_switch = true
+ij_javascript_indent_chained_calls = true
+ij_javascript_indent_package_children = 0
+ij_javascript_jsx_attribute_value = braces
+ij_javascript_keep_blank_lines_in_code = 2
+ij_javascript_keep_first_column_comment = true
+ij_javascript_keep_indents_on_empty_lines = false
+ij_javascript_keep_line_breaks = true
+ij_javascript_keep_simple_blocks_in_one_line = false
+ij_javascript_keep_simple_methods_in_one_line = false
+ij_javascript_line_comment_add_space = true
+ij_javascript_line_comment_at_first_column = false
+ij_javascript_method_brace_style = end_of_line
+ij_javascript_method_call_chain_wrap = off
+ij_javascript_method_parameters_new_line_after_left_paren = false
+ij_javascript_method_parameters_right_paren_on_new_line = false
+ij_javascript_method_parameters_wrap = off
+ij_javascript_object_literal_wrap = on_every_item
+ij_javascript_parentheses_expression_new_line_after_left_paren = false
+ij_javascript_parentheses_expression_right_paren_on_new_line = false
+ij_javascript_place_assignment_sign_on_next_line = false
+ij_javascript_prefer_as_type_cast = false
+ij_javascript_prefer_explicit_types_function_expression_returns = false
+ij_javascript_prefer_explicit_types_function_returns = false
+ij_javascript_prefer_explicit_types_vars_fields = false
+ij_javascript_prefer_parameters_wrap = false
+ij_javascript_reformat_c_style_comments = false
+ij_javascript_space_after_colon = true
+ij_javascript_space_after_comma = true
+ij_javascript_space_after_dots_in_rest_parameter = false
+ij_javascript_space_after_generator_mult = true
+ij_javascript_space_after_property_colon = true
+ij_javascript_space_after_quest = true
+ij_javascript_space_after_type_colon = true
+ij_javascript_space_after_unary_not = false
+ij_javascript_space_before_async_arrow_lparen = true
+ij_javascript_space_before_catch_keyword = true
+ij_javascript_space_before_catch_left_brace = true
+ij_javascript_space_before_catch_parentheses = true
+ij_javascript_space_before_class_lbrace = true
+ij_javascript_space_before_class_left_brace = true
+ij_javascript_space_before_colon = true
+ij_javascript_space_before_comma = false
+ij_javascript_space_before_do_left_brace = true
+ij_javascript_space_before_else_keyword = true
+ij_javascript_space_before_else_left_brace = true
+ij_javascript_space_before_finally_keyword = true
+ij_javascript_space_before_finally_left_brace = true
+ij_javascript_space_before_for_left_brace = true
+ij_javascript_space_before_for_parentheses = true
+ij_javascript_space_before_for_semicolon = false
+ij_javascript_space_before_function_left_parenth = true
+ij_javascript_space_before_generator_mult = false
+ij_javascript_space_before_if_left_brace = true
+ij_javascript_space_before_if_parentheses = true
+ij_javascript_space_before_method_call_parentheses = false
+ij_javascript_space_before_method_left_brace = true
+ij_javascript_space_before_method_parentheses = false
+ij_javascript_space_before_property_colon = false
+ij_javascript_space_before_quest = true
+ij_javascript_space_before_switch_left_brace = true
+ij_javascript_space_before_switch_parentheses = true
+ij_javascript_space_before_try_left_brace = true
+ij_javascript_space_before_type_colon = false
+ij_javascript_space_before_unary_not = false
+ij_javascript_space_before_while_keyword = true
+ij_javascript_space_before_while_left_brace = true
+ij_javascript_space_before_while_parentheses = true
+ij_javascript_spaces_around_additive_operators = true
+ij_javascript_spaces_around_arrow_function_operator = true
+ij_javascript_spaces_around_assignment_operators = true
+ij_javascript_spaces_around_bitwise_operators = true
+ij_javascript_spaces_around_equality_operators = true
+ij_javascript_spaces_around_logical_operators = true
+ij_javascript_spaces_around_multiplicative_operators = true
+ij_javascript_spaces_around_relational_operators = true
+ij_javascript_spaces_around_shift_operators = true
+ij_javascript_spaces_around_unary_operator = false
+ij_javascript_spaces_within_array_initializer_brackets = false
+ij_javascript_spaces_within_brackets = false
+ij_javascript_spaces_within_catch_parentheses = false
+ij_javascript_spaces_within_for_parentheses = false
+ij_javascript_spaces_within_if_parentheses = false
+ij_javascript_spaces_within_imports = false
+ij_javascript_spaces_within_interpolation_expressions = false
+ij_javascript_spaces_within_method_call_parentheses = false
+ij_javascript_spaces_within_method_parentheses = false
+ij_javascript_spaces_within_object_literal_braces = false
+ij_javascript_spaces_within_object_type_braces = true
+ij_javascript_spaces_within_parentheses = false
+ij_javascript_spaces_within_switch_parentheses = false
+ij_javascript_spaces_within_type_assertion = false
+ij_javascript_spaces_within_union_types = true
+ij_javascript_spaces_within_while_parentheses = false
+ij_javascript_special_else_if_treatment = true
+ij_javascript_ternary_operation_signs_on_next_line = false
+ij_javascript_ternary_operation_wrap = off
+ij_javascript_union_types_wrap = on_every_item
+ij_javascript_use_chained_calls_group_indents = false
+ij_javascript_use_double_quotes = true
+ij_javascript_use_explicit_js_extension = global
+ij_javascript_use_path_mapping = always
+ij_javascript_use_public_modifier = false
+ij_javascript_use_semicolon_after_statement = true
+ij_javascript_var_declaration_wrap = normal
+ij_javascript_while_brace_force = never
+ij_javascript_while_on_new_line = false
+ij_javascript_wrap_comments = false
+
+[{*.cjsx,*.coffee}]
+indent_size = 2
+tab_width = 2
+ij_continuation_indent_size = 2
+ij_coffeescript_align_function_body = false
+ij_coffeescript_align_imports = false
+ij_coffeescript_align_multiline_array_initializer_expression = true
+ij_coffeescript_align_multiline_parameters = true
+ij_coffeescript_align_multiline_parameters_in_calls = false
+ij_coffeescript_align_object_properties = 0
+ij_coffeescript_align_union_types = false
+ij_coffeescript_align_var_statements = 0
+ij_coffeescript_array_initializer_new_line_after_left_brace = false
+ij_coffeescript_array_initializer_right_brace_on_new_line = false
+ij_coffeescript_array_initializer_wrap = normal
+ij_coffeescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
+ij_coffeescript_blank_lines_around_function = 1
+ij_coffeescript_call_parameters_new_line_after_left_paren = false
+ij_coffeescript_call_parameters_right_paren_on_new_line = false
+ij_coffeescript_call_parameters_wrap = normal
+ij_coffeescript_chained_call_dot_on_new_line = true
+ij_coffeescript_comma_on_new_line = false
+ij_coffeescript_enforce_trailing_comma = keep
+ij_coffeescript_field_prefix = _
+ij_coffeescript_file_name_style = relaxed
+ij_coffeescript_force_quote_style = false
+ij_coffeescript_force_semicolon_style = false
+ij_coffeescript_function_expression_brace_style = end_of_line
+ij_coffeescript_import_merge_members = global
+ij_coffeescript_import_prefer_absolute_path = global
+ij_coffeescript_import_sort_members = true
+ij_coffeescript_import_sort_module_name = false
+ij_coffeescript_import_use_node_resolution = true
+ij_coffeescript_imports_wrap = on_every_item
+ij_coffeescript_indent_chained_calls = true
+ij_coffeescript_indent_package_children = 0
+ij_coffeescript_jsx_attribute_value = braces
+ij_coffeescript_keep_blank_lines_in_code = 2
+ij_coffeescript_keep_first_column_comment = true
+ij_coffeescript_keep_indents_on_empty_lines = false
+ij_coffeescript_keep_line_breaks = true
+ij_coffeescript_keep_simple_methods_in_one_line = false
+ij_coffeescript_method_parameters_new_line_after_left_paren = false
+ij_coffeescript_method_parameters_right_paren_on_new_line = false
+ij_coffeescript_method_parameters_wrap = off
+ij_coffeescript_object_literal_wrap = on_every_item
+ij_coffeescript_prefer_as_type_cast = false
+ij_coffeescript_prefer_explicit_types_function_expression_returns = false
+ij_coffeescript_prefer_explicit_types_function_returns = false
+ij_coffeescript_prefer_explicit_types_vars_fields = false
+ij_coffeescript_reformat_c_style_comments = false
+ij_coffeescript_space_after_comma = true
+ij_coffeescript_space_after_dots_in_rest_parameter = false
+ij_coffeescript_space_after_generator_mult = true
+ij_coffeescript_space_after_property_colon = true
+ij_coffeescript_space_after_type_colon = true
+ij_coffeescript_space_after_unary_not = false
+ij_coffeescript_space_before_async_arrow_lparen = true
+ij_coffeescript_space_before_class_lbrace = true
+ij_coffeescript_space_before_comma = false
+ij_coffeescript_space_before_function_left_parenth = true
+ij_coffeescript_space_before_generator_mult = false
+ij_coffeescript_space_before_property_colon = false
+ij_coffeescript_space_before_type_colon = false
+ij_coffeescript_space_before_unary_not = false
+ij_coffeescript_spaces_around_additive_operators = true
+ij_coffeescript_spaces_around_arrow_function_operator = true
+ij_coffeescript_spaces_around_assignment_operators = true
+ij_coffeescript_spaces_around_bitwise_operators = true
+ij_coffeescript_spaces_around_equality_operators = true
+ij_coffeescript_spaces_around_logical_operators = true
+ij_coffeescript_spaces_around_multiplicative_operators = true
+ij_coffeescript_spaces_around_relational_operators = true
+ij_coffeescript_spaces_around_shift_operators = true
+ij_coffeescript_spaces_around_unary_operator = false
+ij_coffeescript_spaces_within_array_initializer_braces = false
+ij_coffeescript_spaces_within_array_initializer_brackets = false
+ij_coffeescript_spaces_within_imports = false
+ij_coffeescript_spaces_within_index_brackets = false
+ij_coffeescript_spaces_within_interpolation_expressions = false
+ij_coffeescript_spaces_within_method_call_parentheses = false
+ij_coffeescript_spaces_within_method_parentheses = false
+ij_coffeescript_spaces_within_object_braces = false
+ij_coffeescript_spaces_within_object_literal_braces = false
+ij_coffeescript_spaces_within_object_type_braces = true
+ij_coffeescript_spaces_within_range_brackets = false
+ij_coffeescript_spaces_within_type_assertion = false
+ij_coffeescript_spaces_within_union_types = true
+ij_coffeescript_union_types_wrap = on_every_item
+ij_coffeescript_use_chained_calls_group_indents = false
+ij_coffeescript_use_double_quotes = true
+ij_coffeescript_use_explicit_js_extension = global
+ij_coffeescript_use_path_mapping = always
+ij_coffeescript_use_public_modifier = false
+ij_coffeescript_use_semicolon_after_statement = false
+ij_coffeescript_var_declaration_wrap = normal
+
+[{*.ft,*.vm,*.vsl}]
+ij_vtl_keep_indents_on_empty_lines = false
+
+[{*.gant,*.gradle,*.groovy,*.gy}]
+ij_groovy_align_group_field_declarations = false
+ij_groovy_align_multiline_array_initializer_expression = false
+ij_groovy_align_multiline_assignment = false
+ij_groovy_align_multiline_binary_operation = false
+ij_groovy_align_multiline_chained_methods = false
+ij_groovy_align_multiline_extends_list = false
+ij_groovy_align_multiline_for = true
+ij_groovy_align_multiline_list_or_map = true
+ij_groovy_align_multiline_method_parentheses = false
+ij_groovy_align_multiline_parameters = true
+ij_groovy_align_multiline_parameters_in_calls = false
+ij_groovy_align_multiline_resources = true
+ij_groovy_align_multiline_ternary_operation = false
+ij_groovy_align_multiline_throws_list = false
+ij_groovy_align_named_args_in_map = true
+ij_groovy_align_throws_keyword = false
+ij_groovy_array_initializer_new_line_after_left_brace = false
+ij_groovy_array_initializer_right_brace_on_new_line = false
+ij_groovy_array_initializer_wrap = off
+ij_groovy_assert_statement_wrap = off
+ij_groovy_assignment_wrap = off
+ij_groovy_binary_operation_wrap = off
+ij_groovy_blank_lines_after_class_header = 0
+ij_groovy_blank_lines_after_imports = 1
+ij_groovy_blank_lines_after_package = 1
+ij_groovy_blank_lines_around_class = 1
+ij_groovy_blank_lines_around_field = 0
+ij_groovy_blank_lines_around_field_in_interface = 0
+ij_groovy_blank_lines_around_method = 1
+ij_groovy_blank_lines_around_method_in_interface = 1
+ij_groovy_blank_lines_before_imports = 1
+ij_groovy_blank_lines_before_method_body = 0
+ij_groovy_blank_lines_before_package = 0
+ij_groovy_block_brace_style = end_of_line
+ij_groovy_block_comment_at_first_column = true
+ij_groovy_call_parameters_new_line_after_left_paren = false
+ij_groovy_call_parameters_right_paren_on_new_line = false
+ij_groovy_call_parameters_wrap = off
+ij_groovy_catch_on_new_line = false
+ij_groovy_class_annotation_wrap = split_into_lines
+ij_groovy_class_brace_style = end_of_line
+ij_groovy_class_count_to_use_import_on_demand = 5
+ij_groovy_do_while_brace_force = never
+ij_groovy_else_on_new_line = false
+ij_groovy_enum_constants_wrap = off
+ij_groovy_extends_keyword_wrap = off
+ij_groovy_extends_list_wrap = off
+ij_groovy_field_annotation_wrap = split_into_lines
+ij_groovy_finally_on_new_line = false
+ij_groovy_for_brace_force = never
+ij_groovy_for_statement_new_line_after_left_paren = false
+ij_groovy_for_statement_right_paren_on_new_line = false
+ij_groovy_for_statement_wrap = off
+ij_groovy_if_brace_force = never
+ij_groovy_import_annotation_wrap = 2
+ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
+ij_groovy_indent_case_from_switch = true
+ij_groovy_indent_label_blocks = true
+ij_groovy_insert_inner_class_imports = false
+ij_groovy_keep_blank_lines_before_right_brace = 2
+ij_groovy_keep_blank_lines_in_code = 2
+ij_groovy_keep_blank_lines_in_declarations = 2
+ij_groovy_keep_control_statement_in_one_line = true
+ij_groovy_keep_first_column_comment = true
+ij_groovy_keep_indents_on_empty_lines = false
+ij_groovy_keep_line_breaks = true
+ij_groovy_keep_multiple_expressions_in_one_line = false
+ij_groovy_keep_simple_blocks_in_one_line = false
+ij_groovy_keep_simple_classes_in_one_line = true
+ij_groovy_keep_simple_lambdas_in_one_line = true
+ij_groovy_keep_simple_methods_in_one_line = true
+ij_groovy_label_indent_absolute = false
+ij_groovy_label_indent_size = 0
+ij_groovy_lambda_brace_style = end_of_line
+ij_groovy_layout_static_imports_separately = true
+ij_groovy_line_comment_add_space = false
+ij_groovy_line_comment_at_first_column = true
+ij_groovy_method_annotation_wrap = split_into_lines
+ij_groovy_method_brace_style = end_of_line
+ij_groovy_method_call_chain_wrap = off
+ij_groovy_method_parameters_new_line_after_left_paren = false
+ij_groovy_method_parameters_right_paren_on_new_line = false
+ij_groovy_method_parameters_wrap = off
+ij_groovy_modifier_list_wrap = false
+ij_groovy_names_count_to_use_import_on_demand = 3
+ij_groovy_parameter_annotation_wrap = off
+ij_groovy_parentheses_expression_new_line_after_left_paren = false
+ij_groovy_parentheses_expression_right_paren_on_new_line = false
+ij_groovy_prefer_parameters_wrap = false
+ij_groovy_resource_list_new_line_after_left_paren = false
+ij_groovy_resource_list_right_paren_on_new_line = false
+ij_groovy_resource_list_wrap = off
+ij_groovy_space_after_assert_separator = true
+ij_groovy_space_after_colon = true
+ij_groovy_space_after_comma = true
+ij_groovy_space_after_comma_in_type_arguments = true
+ij_groovy_space_after_for_semicolon = true
+ij_groovy_space_after_quest = true
+ij_groovy_space_after_type_cast = true
+ij_groovy_space_before_annotation_parameter_list = false
+ij_groovy_space_before_array_initializer_left_brace = false
+ij_groovy_space_before_assert_separator = false
+ij_groovy_space_before_catch_keyword = true
+ij_groovy_space_before_catch_left_brace = true
+ij_groovy_space_before_catch_parentheses = true
+ij_groovy_space_before_class_left_brace = true
+ij_groovy_space_before_closure_left_brace = true
+ij_groovy_space_before_colon = true
+ij_groovy_space_before_comma = false
+ij_groovy_space_before_do_left_brace = true
+ij_groovy_space_before_else_keyword = true
+ij_groovy_space_before_else_left_brace = true
+ij_groovy_space_before_finally_keyword = true
+ij_groovy_space_before_finally_left_brace = true
+ij_groovy_space_before_for_left_brace = true
+ij_groovy_space_before_for_parentheses = true
+ij_groovy_space_before_for_semicolon = false
+ij_groovy_space_before_if_left_brace = true
+ij_groovy_space_before_if_parentheses = true
+ij_groovy_space_before_method_call_parentheses = false
+ij_groovy_space_before_method_left_brace = true
+ij_groovy_space_before_method_parentheses = false
+ij_groovy_space_before_quest = true
+ij_groovy_space_before_switch_left_brace = true
+ij_groovy_space_before_switch_parentheses = true
+ij_groovy_space_before_synchronized_left_brace = true
+ij_groovy_space_before_synchronized_parentheses = true
+ij_groovy_space_before_try_left_brace = true
+ij_groovy_space_before_try_parentheses = true
+ij_groovy_space_before_while_keyword = true
+ij_groovy_space_before_while_left_brace = true
+ij_groovy_space_before_while_parentheses = true
+ij_groovy_space_in_named_argument = true
+ij_groovy_space_in_named_argument_before_colon = false
+ij_groovy_space_within_empty_array_initializer_braces = false
+ij_groovy_space_within_empty_method_call_parentheses = false
+ij_groovy_spaces_around_additive_operators = true
+ij_groovy_spaces_around_assignment_operators = true
+ij_groovy_spaces_around_bitwise_operators = true
+ij_groovy_spaces_around_equality_operators = true
+ij_groovy_spaces_around_lambda_arrow = true
+ij_groovy_spaces_around_logical_operators = true
+ij_groovy_spaces_around_multiplicative_operators = true
+ij_groovy_spaces_around_regex_operators = true
+ij_groovy_spaces_around_relational_operators = true
+ij_groovy_spaces_around_shift_operators = true
+ij_groovy_spaces_within_annotation_parentheses = false
+ij_groovy_spaces_within_array_initializer_braces = false
+ij_groovy_spaces_within_braces = true
+ij_groovy_spaces_within_brackets = false
+ij_groovy_spaces_within_cast_parentheses = false
+ij_groovy_spaces_within_catch_parentheses = false
+ij_groovy_spaces_within_for_parentheses = false
+ij_groovy_spaces_within_gstring_injection_braces = false
+ij_groovy_spaces_within_if_parentheses = false
+ij_groovy_spaces_within_list_or_map = false
+ij_groovy_spaces_within_method_call_parentheses = false
+ij_groovy_spaces_within_method_parentheses = false
+ij_groovy_spaces_within_parentheses = false
+ij_groovy_spaces_within_switch_parentheses = false
+ij_groovy_spaces_within_synchronized_parentheses = false
+ij_groovy_spaces_within_try_parentheses = false
+ij_groovy_spaces_within_tuple_expression = false
+ij_groovy_spaces_within_while_parentheses = false
+ij_groovy_special_else_if_treatment = true
+ij_groovy_ternary_operation_wrap = off
+ij_groovy_throws_keyword_wrap = off
+ij_groovy_throws_list_wrap = off
+ij_groovy_use_flying_geese_braces = false
+ij_groovy_use_fq_class_names = false
+ij_groovy_use_fq_class_names_in_javadoc = true
+ij_groovy_use_relative_indents = false
+ij_groovy_use_single_class_imports = true
+ij_groovy_variable_annotation_wrap = off
+ij_groovy_while_brace_force = never
+ij_groovy_while_on_new_line = false
+ij_groovy_wrap_long_lines = false
+
+[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = normal
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = true
+ij_kotlin_call_parameters_wrap = on_every_item
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_continuation_indent_for_chained_calls = false
+ij_kotlin_continuation_indent_for_expression_bodies = false
+ij_kotlin_continuation_indent_in_argument_lists = false
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = true
+ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_method_parameters_wrap = on_every_item
+ij_kotlin_name_count_to_use_star_import = 5
+ij_kotlin_name_count_to_use_star_import_for_members = 3
+ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false
+
+[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config,mcmod.info,pack.mcmeta}]
+indent_size = 2
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = true
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}]
+ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
+ij_html_align_attributes = true
+ij_html_align_text = false
+ij_html_attribute_wrap = normal
+ij_html_block_comment_at_first_column = true
+ij_html_do_not_align_children_of_min_lines = 0
+ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
+ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
+ij_html_enforce_quotes = false
+ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
+ij_html_keep_blank_lines = 2
+ij_html_keep_indents_on_empty_lines = false
+ij_html_keep_line_breaks = true
+ij_html_keep_line_breaks_in_text = true
+ij_html_keep_whitespaces = false
+ij_html_keep_whitespaces_inside = span,pre,textarea
+ij_html_line_comment_at_first_column = true
+ij_html_new_line_after_last_attribute = never
+ij_html_new_line_before_first_attribute = never
+ij_html_quote_style = double
+ij_html_remove_new_line_before_tags = br
+ij_html_space_after_tag_name = false
+ij_html_space_around_equality_in_attribute = false
+ij_html_space_inside_empty_tag = false
+ij_html_text_wrap = normal
+ij_html_uniform_ident = false
+
+[{*.jsf,*.jsp,*.jspf,*.tag,*.tagf,*.xjsp}]
+ij_jsp_jsp_prefer_comma_separated_import_list = false
+ij_jsp_keep_indents_on_empty_lines = false
+
+[{*.jspx,*.tagx}]
+ij_jspx_keep_indents_on_empty_lines = false
+
+[{*.markdown,*.md}]
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+
+[{*.properties,spring.handlers,spring.schemas}]
+ij_properties_align_group_field_declarations = false
+ij_properties_keep_blank_lines = false
+ij_properties_key_value_delimiter = equals
+ij_properties_spaces_around_key_value_delimiter = false
+
+[{*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 26efeec3..832e991c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,10 +57,10 @@ jobs:
     #    uses a compiled language
 
     - run: |
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 21
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 048b7d3e..de336c35 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 21
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
diff --git a/.gitignore b/.gitignore
index 2d79b817..d20abb20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 gradle
 build
 /src/main/resources/swear_filter.json
+
+*.json
+*.txt
diff --git a/README.md b/README.md
index 95404050..8a2caae4 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,11 @@ provide codeblock information.
 
 **Contribution**
 
-HelpBot is created in **java 11** and there are no current rules in place for contribution. If you want to add/modify
+HelpBot is created in **java 16** and there are no current rules in place for contribution. If you want to add/modify
 something you are able to create a **fork** and submit a **pull request**.
 
 Most pull requests are accepted, do not be afraid to make a change I promise I do not bite.
+Please give me time to review your PR however, as it takes a little bit for me to make sure that your PR is up to standards. Testing will help!
 
 **Config File**
 
@@ -60,3 +61,13 @@ After setting up the config, you will need to paste the following into the swear
   ]
 }
 ```
+
+## Special Thanks To
+
+![YourKit Logo](https://www.yourkit.com/images/yklogo.png)
+
+YourKit supports open source projects with innovative and intelligent tools
+for monitoring and profiling Java and .NET applications.
+YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/),
+[YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),
+and [YourKit YouMonitor](ttps://www.yourkit.com/youmonitor/).
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 9a837368..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-plugins {
-    id 'java'
-    id 'application'
-    id 'com.github.johnrengelman.shadow' version '4.0.4'
-}
-mainClassName = 'com.diamondfire.helpbot.HelpBot'
-group 'com.diamondfire.helpbot'
-
-repositories {
-    mavenCentral()
-    jcenter()
-    maven { url 'https://jitpack.io' }
-
-}
-
-dependencies {
-    implementation ('net.dv8tion:JDA:4.2.0_207') {
-        exclude module: 'opus-java'
-    }
-    implementation  'ch.qos.logback:logback-classic:1.2.3'
-    implementation  group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
-    implementation 'com.github.Steveice10:MCProtocolLib:bf0a6be'
-    implementation  group: 'mysql', name: 'mysql-connector-java', version: '5.1.13'
-}
-jar {
-    manifest {
-        attributes(
-                'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
-                'Main-Class': mainClassName
-        )
-    }
-}
-
-compileJava.options.encoding = 'UTF-8'
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..18c59987
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    java
+    application
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+}
+
+application {
+    mainClass.set("com.diamondfire.helpbot.HelpBot")
+}
+
+group = "com.diamondfire.helpbot"
+
+repositories {
+    mavenCentral()
+    maven(url = "https://jitpack.io")
+    maven(url = "https://m2.dv8tion.net/releases")
+    maven("https://repo.opencollab.dev/maven-releases/") {
+        name = "opencollab"
+    }
+}
+
+dependencies {
+    implementation ("net.dv8tion:JDA:6.1.0") {
+        exclude(module = "opus-java")
+    }
+
+    implementation("club.minnced:discord-webhooks:0.5.8")
+    implementation("ch.qos.logback:logback-classic:1.2.5")
+    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("org.geysermc.mcprotocollib:protocol:1.21.7-1")
+    implementation("mysql:mysql-connector-java:5.1.13")
+    implementation("org.codehaus.groovy:groovy-jsr223:3.0.8")
+    implementation("net.kyori:adventure-api:4.24.0")
+    implementation("net.kyori:adventure-text-minimessage:4.24.0")
+    implementation("dev.vankka:mcdiscordreserializer:4.3.0")
+}
+
+tasks {
+    compileJava {
+        options.encoding = "UTF-8"
+    }
+
+    jar {
+        manifest {
+            attributes["Main-Class"] = "com.diamondfire.helpbot.HelpBot"
+        }
+    }
+
+    build {
+        dependsOn(shadowJar)
+    }
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c..9bbc975c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4b44297..37f853b1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index 2fe81a7d..faf93008
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,80 +15,115 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,87 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d9..9d21a218 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +27,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -51,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 4dc9ef82..00000000
--- a/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = 'DFHelpBot'
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000..73b2f357
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "DFHelpBot"
+
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index ba74b720..00000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: com.diamondfire.helpbot.HelpBot
diff --git a/src/main/java/com/diamondfire/helpbot/HelpBot.java b/src/main/java/com/diamondfire/helpbot/HelpBot.java
index ec980141..95b064b0 100644
--- a/src/main/java/com/diamondfire/helpbot/HelpBot.java
+++ b/src/main/java/com/diamondfire/helpbot/HelpBot.java
@@ -1,6 +1,5 @@
 package com.diamondfire.helpbot;
 
-
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.changelog.CodeDifferenceHandler;
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.CodeDatabase;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/HelpBotInstance.java b/src/main/java/com/diamondfire/helpbot/bot/HelpBotInstance.java
index 79584d35..7c297f70 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/HelpBotInstance.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/HelpBotInstance.java
@@ -2,36 +2,48 @@
 
 import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.impl.codeblock.*;
-import com.diamondfire.helpbot.bot.command.impl.other.*;
+import com.diamondfire.helpbot.bot.command.impl.other.StoreCommand;
+import com.diamondfire.helpbot.bot.command.impl.other.dev.*;
+import com.diamondfire.helpbot.bot.command.impl.other.dumps.*;
+import com.diamondfire.helpbot.bot.command.impl.other.fun.*;
+import com.diamondfire.helpbot.bot.command.impl.other.info.*;
+import com.diamondfire.helpbot.bot.command.impl.other.mod.*;
+import com.diamondfire.helpbot.bot.command.impl.other.tag.TagCommand;
+import com.diamondfire.helpbot.bot.command.impl.other.util.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.graph.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.individualized.*;
+import com.diamondfire.helpbot.bot.command.impl.stats.metrics.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.plot.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.support.*;
+import com.diamondfire.helpbot.bot.command.impl.stats.top.*;
 import com.diamondfire.helpbot.bot.config.Config;
 import com.diamondfire.helpbot.bot.events.*;
 import com.diamondfire.helpbot.sys.tasks.TaskRegistry;
+import com.google.gson.Gson;
 import net.dv8tion.jda.api.*;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
+import okhttp3.OkHttpClient;
 
 import javax.security.auth.login.LoginException;
 
 public class HelpBotInstance {
     
+    public static final Gson GSON = new Gson();
+    
     private static final Config config = new Config();
     public static final long DF_GUILD = config.getGuild();
     public static final long LOG_CHANNEL = config.getLogChannel();
-    private static final CommandHandler handler = new CommandHandler();
     
     private static JDA jda;
     private static final TaskRegistry loop = new TaskRegistry();
     
     public static void initialize() throws LoginException {
         
-        handler.register(
+        CommandHandler.getInstance().register(
                 // codeblock commands
                 new CodeCommand(),
                 new RankCommand(),
@@ -39,11 +51,13 @@ public static void initialize() throws LoginException {
                 new SearchCommand(),
                 new TagsCommand(),
                 // others
+                //new CowsayCommand(),
                 new MimicCommand(),
-                new FetchDataCommand(),
+                new SolvedCommand(),
+                //new FetchDataCommand(),
                 new InfoCommand(),
                 new EvalCommand(),
-                new GarfieldCommand(),
+                //new GarfieldCommand(),
                 new HelpCommand(),
                 new RestartCommand(),
                 new ActionDumpCommand(),
@@ -64,9 +78,10 @@ public static void initialize() throws LoginException {
                 new MutedCommand(),
                 new UnmuteCommand(),
                 new VerifyCommand(),
-                new PollCommand(),
+                // new PollCommand(), - Unused
                 new IdeaCommand(),
-                new ChannelMuteCommand(),
+                // new StoreCommand(),
+                // new ChannelMuteCommand(), - not finished
                 // statsbot
                 new StatsCommand(),
                 new SupportBadCommand(),
@@ -76,7 +91,7 @@ public static void initialize() throws LoginException {
                 new ActivePlotsCommand(),
                 new TrendingPlotsCommand(),
                 new PlotsCommand(),
-                new CpTopCommand(),
+                //new CpTopCommand(),
                 new RetiredListCommand(),
                 new StaffListCommand(),
                 new SessionTopCommand(),
@@ -92,10 +107,10 @@ public static void initialize() throws LoginException {
                 new QueueCommand(),
                 new WhoHelpedCommand(),
                 new HelpedByCommand(),
-                new NamesCommand(),
+                // new NamesCommand(), - Dead
                 new PlayerJoinGraphCommand(),
-                new CpCommand(),
-                new CpRequirementsCommand(),
+                //new CpCommand(),
+                //new CpRequirementsCommand(),
                 new VoteGivenLeaderboard(),
                 new PlotVoteGraphCommand(),
                 new JoinDataCommand(),
@@ -110,34 +125,32 @@ public static void initialize() throws LoginException {
                 new ExcuseStaffCommand(),
                 new ExcusedStaffCommand(),
                 new SupportBannedPlayersCommand(),
-                new DiscussionMuteCommand(),
                 new NbsCommand(),
                 new DailySessionsCommand(),
                 new EightBallCommand(),
-                new JoinsCommand()
+                // new OcrCommand(), - Dead
+                new JoinsCommand(),
+                new TagCommand(),
+                new PurgeCommand()
         );
         
         JDABuilder builder = JDABuilder.createDefault(config.getToken())
-                .enableIntents(GatewayIntent.GUILD_MEMBERS)
+                .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT, GatewayIntent.DIRECT_MESSAGES, GatewayIntent.DIRECT_MESSAGE_REACTIONS)
                 .setStatus(OnlineStatus.ONLINE)
                 .setMemberCachePolicy(MemberCachePolicy.NONE)
                 .setActivity(Activity.watching("for " + getConfig().getPrefix() + "help"))
                 .setGatewayEncoding(GatewayEncoding.ETF)
                 .disableCache(CacheFlag.ACTIVITY, CacheFlag.VOICE_STATE, CacheFlag.CLIENT_STATUS)
-                .addEventListeners(new MessageEvent(), new ReactionEvent(), new ReadyEvent(), new GuildJoinEvent());
+                .addEventListeners(new MessageEvent(), new ReadyEvent(), new GuildJoinEvent(), new ButtonEvent(), new MessageEditEvent(), new PostChannelEvent(), new ChannelCreatedEvent(), new ChannelUpdatedNameEvent());
         
         jda = builder.build();
-        handler.initialize();
+        CommandHandler.getInstance().initialize();
     }
     
     public static JDA getJda() {
         return jda;
     }
     
-    public static CommandHandler getHandler() {
-        return handler;
-    }
-    
     public static Config getConfig() {
         return config;
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/CommandHandler.java b/src/main/java/com/diamondfire/helpbot/bot/command/CommandHandler.java
index 71b88060..9f3a9e30 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/CommandHandler.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/CommandHandler.java
@@ -1,6 +1,5 @@
 package com.diamondfire.helpbot.bot.command;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.disable.DisableCommandHandler;
 import com.diamondfire.helpbot.bot.command.executor.CommandExecutor;
 import com.diamondfire.helpbot.bot.command.impl.Command;
@@ -14,15 +13,21 @@ public class CommandHandler {
     private final HashMap<String, Command> ALIASES = new HashMap<>();
     private final CommandExecutor COMMAND_EXECUTOR = new CommandExecutor();
     private final DisableCommandHandler DISABLED_COMMAND_HANDLER = new DisableCommandHandler();
+
+    private static CommandHandler instance;
+    
+    private CommandHandler() {
+        instance = this;
+    }
     
     public void initialize() {
         DISABLED_COMMAND_HANDLER.initialize();
     }
     
     public static Command getCommand(String name) {
-        Command cmd = HelpBotInstance.getHandler().getCommands().get(name.toLowerCase());
+        Command cmd = CommandHandler.getInstance().getCommands().get(name.toLowerCase());
         if (cmd == null) {
-            cmd = HelpBotInstance.getHandler().getAliases().get(name.toLowerCase());
+            cmd = CommandHandler.getInstance().getAliases().get(name.toLowerCase());
         }
         
         return cmd;
@@ -38,8 +43,12 @@ public void register(Command... commands) {
         
     }
     
+    public void run(CommandEvent e, String[] args) {
+        COMMAND_EXECUTOR.run(e, args);
+    }
+    
     public void run(CommandEvent e) {
-        COMMAND_EXECUTOR.run(e);
+        run(e, e.getRawArgs());
     }
     
     public HashMap<String, Command> getCommands() {
@@ -53,4 +62,8 @@ public HashMap<String, Command> getAliases() {
     public DisableCommandHandler getDisabledHandler() {
         return DISABLED_COMMAND_HANDLER;
     }
-}
+    
+    public static CommandHandler getInstance() {
+        return instance == null ? new CommandHandler() : instance;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/ArgumentStack.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/ArgumentStack.java
index ba357885..261ad737 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/ArgumentStack.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/ArgumentStack.java
@@ -11,6 +11,8 @@ public class ArgumentStack {
     public ArgumentStack(List<ArgumentNode<?>> args, Collection<String> rawArgs) {
         this.stack = new RawArgumentStack(new ArrayDeque<>(rawArgs));
         this.args = new ArrayDeque<>(args);
+        
+        stack.stack.removeIf(String::isEmpty);
     }
     
     public RawArgumentStack getRawArguments() {
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/exceptions/ArgumentException.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/exceptions/ArgumentException.java
index 513d87b4..b04f9379 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/exceptions/ArgumentException.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/exceptions/ArgumentException.java
@@ -1,6 +1,8 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions;
 
-import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.impl.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.util.FormatUtil;
 
 public class ArgumentException extends Exception {
@@ -16,11 +18,17 @@ public String getEmbedMessage() {
         return message;
     }
     
-    public void setContext(Command command, int pos) {
+    public void setContext(Command command, int pos, CommandEvent event) {
         String[] args = FormatUtil.getArgumentDisplay(command.getHelpContext());
         args[pos] = "**" + args[pos] + "**";
         String argMessage = FormatUtil.displayCommand(command) + " " + String.join(" ", args);
         
+        if (command instanceof SubCommand) {
+            String prefix = HelpBotInstance.getConfig().getPrefix();
+            
+            argMessage = event.getRawArgs()[0] + " " + argMessage.substring(prefix.length());
+        }
+        
         message = argMessage + "\n\n" + getMessage();
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/AlternateArgumentParser.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/AlternateArgumentParser.java
index 0b7b0458..aa794e5b 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/AlternateArgumentParser.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/AlternateArgumentParser.java
@@ -3,6 +3,7 @@
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.*;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 
 public class AlternateArgumentParser<A> extends ArgumentParser<AlternateArgumentContainer<A>, A> {
     
@@ -11,10 +12,10 @@ public AlternateArgumentParser(AlternateArgumentContainer<A> container) {
     }
     
     @Override
-    public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args) throws ArgumentException {
+    public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args, CommandEvent event) throws ArgumentException {
         for (ArgumentContainer<?> container : getContainer().getAlternatives()) {
             try {
-                return new ParsedArgument<>(identifier, container.getParser().parse(identifier, args).getValue());
+                return new ParsedArgument<>(identifier, container.getParser().parse(identifier, args, event).getValue());
             } catch (ArgumentException ignored) {
             }
         }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/ArgumentParser.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/ArgumentParser.java
index 4e6bce11..31b96766 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/ArgumentParser.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/ArgumentParser.java
@@ -4,6 +4,7 @@
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.ArgumentContainer;
 import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 
 import java.util.*;
 
@@ -16,7 +17,7 @@ public ArgumentParser(T container) {
         this.container = container;
     }
     
-    public static ParsedArgumentSet parseArgs(Command command, String[] args) throws ArgumentException {
+    public static ParsedArgumentSet parseArgs(Command command, String[] args, CommandEvent event) throws ArgumentException {
         Map<String, ParsedArgument<?>> parsedArgs = new HashMap<>();
         ArgumentStack stack = new ArgumentStack(command.getArguments().getArguments(), Arrays.asList(args));
         int arguments = stack.getArguments().size();
@@ -28,17 +29,17 @@ public static ParsedArgumentSet parseArgs(Command command, String[] args) throws
             String identifier = argument.getIdentifier();
             
             try {
-                parsedArgs.put(identifier, argumentContainer.getParser().parse(identifier, rawArguments));
+                parsedArgs.put(identifier, argumentContainer.getParser().parse(identifier, rawArguments, event));
                 rawArguments.pushStack();
             } catch (MissingArgumentException exception) {
                 if (argumentContainer.isOptional()) {
                     parsedArgs.put(identifier, new ParsedArgument<>(identifier, argumentContainer.getDefaultValue()));
                 } else {
-                    exception.setContext(command, i);
+                    exception.setContext(command, i, event);
                     throw exception;
                 }
             } catch (MalformedArgumentException exception) {
-                exception.setContext(command, i);
+                exception.setContext(command, i, event);
                 throw exception;
             }
         }
@@ -46,7 +47,7 @@ public static ParsedArgumentSet parseArgs(Command command, String[] args) throws
         return new ParsedArgumentSet(parsedArgs);
     }
     
-    public abstract ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args) throws ArgumentException;
+    public abstract ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args, CommandEvent event) throws ArgumentException;
     
     protected T getContainer() {
         return container;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/MultiArgumentParser.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/MultiArgumentParser.java
index 1da2a3b7..251ea868 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/MultiArgumentParser.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/MultiArgumentParser.java
@@ -4,6 +4,7 @@
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.MultiArgumentContainer;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.Argument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 
 import java.util.*;
 
@@ -14,7 +15,7 @@ public MultiArgumentParser(MultiArgumentContainer<A> container) {
     }
     
     @Override
-    public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args) throws ArgumentException {
+    public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args, CommandEvent event) throws ArgumentException {
         Deque<String> rawArgs = args.popStack();
         List<A> approvedArgumentValues = new ArrayList<>();
         Argument<A> arg = getContainer().getArgument();
@@ -22,7 +23,7 @@ public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack
         
         for (int i = 0; i < arguments; i++) {
             try {
-                approvedArgumentValues.add(arg.parseValue(rawArgs));
+                approvedArgumentValues.add(arg.parseValue(rawArgs, event));
             } catch (Exception e) {
                 break;
             }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/SingleArgumentParser.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/SingleArgumentParser.java
index 287cff41..120f846f 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/SingleArgumentParser.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/parser/SingleArgumentParser.java
@@ -4,6 +4,7 @@
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.Argument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 
 import java.util.Deque;
 
@@ -15,7 +16,7 @@ public SingleArgumentParser(SingleArgumentContainer<A> container) {
     }
     
     @Override
-    public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args) throws ArgumentException {
+    public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack args, CommandEvent event) throws ArgumentException {
         Deque<String> rawArgs = args.popStack();
         Argument<A> arg = getContainer().getArgument();
         
@@ -23,6 +24,6 @@ public ParsedArgument<?> parse(String identifier, ArgumentStack.RawArgumentStack
             throw new MissingArgumentException("Expected an argument, but got nothing.");
         }
         
-        return new ParsedArgument<>(identifier, arg.parseValue(rawArgs));
+        return new ParsedArgument<>(identifier, arg.parseValue(rawArgs, event));
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/types/MessageArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/types/MessageArgument.java
index fc6adeb6..45087da0 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/types/MessageArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/parsing/types/MessageArgument.java
@@ -2,6 +2,7 @@
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.Argument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Deque;
@@ -9,7 +10,7 @@
 public class MessageArgument implements Argument<String> {
     
     @Override
-    public String parseValue(@NotNull Deque<String> args) throws ArgumentException {
+    public String parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException {
         return String.join(" ", args);
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractOffsetArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractOffsetArgument.java
index ebbe6db7..00b1dbb3 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractOffsetArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractOffsetArgument.java
@@ -1,6 +1,7 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -18,7 +19,7 @@ public AbstractOffsetArgument(boolean reverse) {
     }
     
     @Override
-    protected Date parse(@NotNull String argument) throws ArgumentException {
+    protected Date parse(@NotNull String argument, CommandEvent event) throws ArgumentException {
         Calendar calendar = Calendar.getInstance();
         int offset = 0;
         boolean modified = false;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractSimpleValueArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractSimpleValueArgument.java
index dcb81ec5..14ca00d8 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractSimpleValueArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/AbstractSimpleValueArgument.java
@@ -1,6 +1,7 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Deque;
@@ -8,10 +9,10 @@
 public abstract class AbstractSimpleValueArgument<T> implements Argument<T> {
     
     @Override
-    public T parseValue(@NotNull Deque<String> args) throws ArgumentException {
-        return parse(args.pop());
+    public T parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException {
+        return parse(args.pop(), event);
     }
     
-    protected abstract T parse(@NotNull String argument) throws ArgumentException;
+    protected abstract T parse(@NotNull String argument, CommandEvent event) throws ArgumentException;
     
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Argument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Argument.java
index a663106a..d7ac58f1 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Argument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Argument.java
@@ -2,15 +2,20 @@
 
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Deque;
 
-// Arguments simply parse a given value and can remove it from the stack if they process it correctly.
-// This means an argument can actually use more than one argument if they want!
+/**
+ * Arguments simply parse a given value and can remove it from the stack if they process it correctly.
+ * This means an argument can actually use more than one argument if they want!
+ *
+ * @param <T> parsed value type
+ */
 public interface Argument<T> {
     
-    T parseValue(@NotNull Deque<String> args) throws ArgumentException;
+    T parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException;
     
 }
- 
\ No newline at end of file
+
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/ClampedIntegerArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/ClampedIntegerArgument.java
index 8ef2ceea..79f496a7 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/ClampedIntegerArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/ClampedIntegerArgument.java
@@ -1,6 +1,7 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.util.Util;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,8 +21,8 @@ public ClampedIntegerArgument(int min, int max) {
     }
     
     @Override
-    public Integer parse(@NotNull String msg) throws ArgumentException {
-        int num = super.parse(msg);
+    public Integer parse(@NotNull String msg, CommandEvent event) throws ArgumentException {
+        int num = super.parse(msg, event);
         
         if (num <= max && num >= min) {
             return num;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DateArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DateArgument.java
index 815fdae6..c50c699f 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DateArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DateArgument.java
@@ -1,6 +1,7 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.text.*;
@@ -19,7 +20,7 @@ public DateArgument(String format) {
     }
     
     @Override
-    public Date parse(@NotNull String msg) throws ArgumentException {
+    public Date parse(@NotNull String msg, CommandEvent event) throws ArgumentException {
         try {
             return format.parse(msg);
         } catch (ParseException parseException) {
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DefinedObjectArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DefinedObjectArgument.java
index f22b5991..c06d463d 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DefinedObjectArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DefinedObjectArgument.java
@@ -2,6 +2,7 @@
 
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.util.JaroWinkler;
 import org.jetbrains.annotations.NotNull;
 
@@ -26,7 +27,7 @@ public DefinedObjectArgument(boolean trailing, @NotNull T... options) {
     }
     
     @Override
-    public T parseValue(@NotNull Deque<String> args) throws ArgumentException {
+    public T parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException {
         String compareString;
         if (trailing) {
             compareString = String.join(" ", args);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DiscordUserArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DiscordUserArgument.java
index 85bce2e9..b0eef190 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DiscordUserArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/DiscordUserArgument.java
@@ -1,6 +1,7 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.MalformedArgumentException;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import net.dv8tion.jda.api.utils.MiscUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,7 +12,7 @@ public class DiscordUserArgument extends AbstractSimpleValueArgument<Long> {
     private final Pattern pattern = Pattern.compile("<@!?(\\d+)>");
     
     @Override
-    public Long parse(@NotNull String msg) throws MalformedArgumentException {
+    public Long parse(@NotNull String msg, CommandEvent event) throws MalformedArgumentException {
         
         try {
             return Long.parseLong(msg);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/EndlessStringArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/EndlessStringArgument.java
new file mode 100644
index 00000000..ec1a4215
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/EndlessStringArgument.java
@@ -0,0 +1,15 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Deque;
+
+public class EndlessStringArgument implements Argument<String> {
+    
+    @Override
+    public String parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException {
+        return String.join(" ", args);
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/EnumArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/EnumArgument.java
new file mode 100644
index 00000000..77434925
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/EnumArgument.java
@@ -0,0 +1,54 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types.Enum;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.AbstractSimpleValueArgument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.EnumSet;
+import java.util.stream.Collectors;
+
+public class EnumArgument<E extends Enum<E> & EnumArgument.InputEnum> extends AbstractSimpleValueArgument<E> {
+    
+    private EnumSet<E> associatedEnum;
+    
+    public EnumArgument<E> setEnum(Class<E> anEnum) {
+        associatedEnum = EnumSet.allOf(anEnum);
+        return this;
+    }
+    
+    @Override
+    protected E parse(@NotNull String argument, CommandEvent event) throws ArgumentException {
+        for (E enumValue : associatedEnum) {
+            if (argument.equals(enumValue.getName())) {
+                return enumValue;
+            }
+        }
+        
+        throw new MalformedArgumentException("This is not a valid option! Choose from: " + getFormattedOptions());
+    }
+    
+    private String getFormattedOptions() {
+        return getFormattedOptions(associatedEnum);
+    }
+    
+    public static <T extends Enum<T> & InputEnum> String getFormattedOptions(@NotNull Class<T> anEnum) {
+        return getFormattedOptions(EnumSet.allOf(anEnum));
+    }
+    
+    public static String getFormattedOptions(@NotNull EnumSet<? extends InputEnum> anEnum) {
+        return "`" +
+                anEnum.stream()
+                        .filter(e -> !e.isHidden())
+                        .map(InputEnum::getName)
+                        .collect(Collectors.joining("` `"))
+                + "`";
+    }
+    
+    protected interface InputEnum {
+        
+        String getName();
+        
+        boolean isHidden();
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/TagProperty.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/TagProperty.java
new file mode 100644
index 00000000..de1b1fba
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/TagProperty.java
@@ -0,0 +1,60 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types.Enum;
+
+import com.diamondfire.helpbot.sys.tag.Tag;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.BiConsumer;
+
+public enum TagProperty implements EnumArgument.InputEnum {
+    
+    ACTIVATOR("activator", true, Tag::setActivator),
+    TITLE("title", true, Tag::setTitle),
+    RESPONSE("response", true, Tag::setResponse),
+    AUTHOR_ID("authorId", false, (tag, newValue) -> {
+        throw new UnsupportedOperationException();
+    }),
+    IMAGE("image", true, Tag::setImage)
+    ;
+    
+    private final String name;
+    private final boolean modifiable;
+    private final BiConsumer<Tag, String> modifier;
+    
+    TagProperty(String name, boolean modifiable, BiConsumer<Tag, String> modifier) {
+        this.name = name;
+        this.modifiable = modifiable;
+        this.modifier = modifier;
+    }
+    
+    public static @NotNull TagProperty of(String property) {
+        for (TagProperty tagProperty : TagProperty.values()) {
+            if (tagProperty.getName().equals(property)) {
+                return tagProperty;
+            }
+        }
+        
+        throw new IllegalArgumentException();
+    }
+    
+    @Override
+    public String getName() {
+        return name;
+    }
+    
+    @Override
+    public boolean isHidden() {
+        return !isModifiable();
+    }
+    
+    public boolean isModifiable() {
+        return modifiable;
+    }
+    
+    public void set(Tag tag, String newValue) {
+        getModifier().accept(tag, newValue);
+    }
+    
+    public BiConsumer<Tag, String> getModifier() {
+        return modifier;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/IntegerArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/IntegerArgument.java
index d30b42a4..c2061cfe 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/IntegerArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/IntegerArgument.java
@@ -1,12 +1,13 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 public class IntegerArgument extends AbstractSimpleValueArgument<Integer> {
     
     @Override
-    public Integer parse(@NotNull String msg) throws ArgumentException {
+    public Integer parse(@NotNull String msg, CommandEvent event) throws ArgumentException {
         try {
             return Integer.parseInt(msg);
         } catch (NumberFormatException exception) {
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/LongArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/LongArgument.java
index dad4cc9c..3be8d19d 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/LongArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/LongArgument.java
@@ -1,12 +1,13 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 public class LongArgument extends AbstractSimpleValueArgument<Long>{
     
     @Override
-    protected Long parse(@NotNull String argument) throws ArgumentException {
+    protected Long parse(@NotNull String argument, CommandEvent event) throws ArgumentException {
         return Long.parseLong(argument);
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/QuoteStringArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/QuoteStringArgument.java
new file mode 100644
index 00000000..f75c1784
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/QuoteStringArgument.java
@@ -0,0 +1,41 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+public class QuoteStringArgument implements Argument<String> {
+    
+    private static final String ERROR_MESSAGE = "Invalid quote, must start and end with `'` or `\"`.";
+    
+    @Override
+    public String parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException {
+    
+        // Check if argument starts with quote
+        if (!(args.element().startsWith("'") || args.peek().startsWith("\""))) {
+            throw new MalformedArgumentException(ERROR_MESSAGE);
+        }
+    
+        // Init variables
+        List<String> elements = new ArrayList<>();
+        String argument = args.poll();
+        elements.add(argument);
+    
+        // Repeat arguments until end is reached (exception) or an end quote is found
+        while (!(argument.endsWith("'") || argument.endsWith("\""))) {
+            argument = args.poll();
+            
+            if (argument == null) {
+                throw new MalformedArgumentException(ERROR_MESSAGE);
+            }
+        
+            elements.add(argument);
+        }
+    
+        // Join elements and remove quotes
+        String result = String.join(" ", elements);
+        return result.substring(1, result.length()-1);
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/StringArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/StringArgument.java
index a50da829..e8b56065 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/StringArgument.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/StringArgument.java
@@ -1,11 +1,12 @@
 package com.diamondfire.helpbot.bot.command.argument.impl.types;
 
+import com.diamondfire.helpbot.bot.events.CommandEvent;
 import org.jetbrains.annotations.NotNull;
 
 public class StringArgument extends AbstractSimpleValueArgument<String> {
     
     @Override
-    public String parse(@NotNull String msg) {
+    public String parse(@NotNull String msg, CommandEvent event) {
         return msg;
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/SubCommandArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/SubCommandArgument.java
new file mode 100644
index 00000000..c4153ea2
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/SubCommandArgument.java
@@ -0,0 +1,24 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.command.impl.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public class SubCommandArgument extends AbstractSimpleValueArgument<SubCommand> {
+    
+    @Override
+    public SubCommand parse(@NotNull String msg, CommandEvent event) throws ArgumentException {
+        try {
+            return Arrays.stream(((SubCommandHolder) event.getCommand()).getSubCommands())
+                    .filter(s -> s.getName().equals(msg)).collect(Collectors.toList()).get(0);
+        } catch (IndexOutOfBoundsException e) {
+            throw new MalformedArgumentException(
+                    "Not a valid subcommand. Choose from " + event.getCommand().getHelpContext().getArguments().get(0).getArgumentName());
+        }
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/DFPlayerArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/DFPlayerArgument.java
new file mode 100644
index 00000000..9fdce5f7
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/DFPlayerArgument.java
@@ -0,0 +1,50 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.AbstractSimpleValueArgument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
+import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
+import com.diamondfire.helpbot.sys.database.impl.result.DatabaseResult;
+import org.jetbrains.annotations.*;
+
+import java.sql.ResultSet;
+import java.util.UUID;
+
+public class DFPlayerArgument extends AbstractSimpleValueArgument<Player> {
+    
+    public static @Nullable Player fetchPlayer(String argument) {
+        DatabaseResult result = new DatabaseQuery()
+                .query(new BasicQuery("SELECT * FROM players WHERE players.name = ? OR players.uuid = ? LIMIT 1;", (statement) -> {
+                    statement.setString(1, argument);
+                    statement.setString(2, argument);
+                }))
+                .compile()
+                .get();
+        
+        if (result.isEmpty()) {
+            return null;
+        }
+        
+        try {
+            ResultSet set = result.getResult();
+            
+            UUID uuid = UUID.fromString(set.getString("uuid"));
+            String playerName = set.getString("name");
+            
+            return new Player(playerName, uuid);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    @Override
+    protected Player parse(@NotNull String argument, CommandEvent event) throws ArgumentException {
+        Player player = fetchPlayer(argument);
+        if (player == null) {
+            throw new MalformedArgumentException("Player has not joined DiamondFire before, or does not exist.");
+        }
+        
+        return player;
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/MojangPlayerUUIDArgument.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/MojangPlayerUUIDArgument.java
new file mode 100644
index 00000000..92468d80
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/MojangPlayerUUIDArgument.java
@@ -0,0 +1,36 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.AbstractSimpleValueArgument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.util.*;
+import com.google.gson.JsonObject;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.util.UUID;
+
+// TODO: Player
+public class MojangPlayerUUIDArgument extends AbstractSimpleValueArgument<UUID> {
+    
+    @Override
+    protected UUID parse(@NotNull String argument, CommandEvent event) throws ArgumentException {
+        if (argument.length() > 16) {
+           return Util.toUuid(argument);
+        } else {
+            JsonObject responseObject = null;
+            
+            try {
+                responseObject = WebUtil.getJson("https://api.mojang.com/users/profiles/minecraft/" + argument).getAsJsonObject();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            
+            if (responseObject.has("id")) {
+                return Util.toUuid(responseObject.get("id").getAsString());
+            } else {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/Player.java b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/Player.java
new file mode 100644
index 00000000..b6ffb8ca
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/Player.java
@@ -0,0 +1,11 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft;
+
+import java.util.UUID;
+
+public record Player(String name, UUID uuid) {
+    
+    public String uuidString() {
+        return uuid.toString();
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/disable/DisableCommandHandler.java b/src/main/java/com/diamondfire/helpbot/bot/command/disable/DisableCommandHandler.java
index 14c925e1..a72af1b5 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/disable/DisableCommandHandler.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/disable/DisableCommandHandler.java
@@ -48,6 +48,9 @@ public void enable(Command command) {
     }
     
     public void disable(Command command) {
+        if (command == null) {
+            return;
+        }
         // Prevents tricky people using eval.
         if (command instanceof CommandDisableFlag) {
             return;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/executor/CommandExecutor.java b/src/main/java/com/diamondfire/helpbot/bot/command/executor/CommandExecutor.java
index 4d4d099b..72a1b4af 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/executor/CommandExecutor.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/executor/CommandExecutor.java
@@ -19,10 +19,10 @@ public class CommandExecutor {
             new MutedCheck(),
             new DisabledCheck(),
             new PermissionCheck(),
-            new CommandLog(),
+            new CommandLog()
     };
     
-    public void run(CommandEvent e) {
+    public void run(CommandEvent e, String[] args) {
         Command command = e.getCommand();
         if (command == null) {
             return;
@@ -38,7 +38,7 @@ public void run(CommandEvent e) {
                     }
                 }
                 
-                e.pushArguments(e.getMessage().getContentRaw().split(" "));
+                e.pushArguments(args);
                 command.run(e);
             } catch (ArgumentException exception) {
                 builder.withPreset(
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/DisabledCheck.java b/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/DisabledCheck.java
index e72b5059..8f43e4d9 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/DisabledCheck.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/DisabledCheck.java
@@ -1,15 +1,14 @@
 package com.diamondfire.helpbot.bot.command.executor.checks;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
 import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 
 public class DisabledCheck implements CommandCheck {
-    
     @Override
     public boolean check(CommandEvent event) {
-        return !HelpBotInstance.getHandler().getDisabledHandler().isDisabled(event.getCommand());
+        return !CommandHandler.getInstance().getDisabledHandler().isDisabled(event.getCommand());
     }
     
     @Override
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/MutedCheck.java b/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/MutedCheck.java
index 1352b30a..fd88cc76 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/MutedCheck.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/MutedCheck.java
@@ -1,6 +1,6 @@
 package com.diamondfire.helpbot.bot.command.executor.checks;
 
-import com.diamondfire.helpbot.bot.command.impl.other.MuteCommand;
+import com.diamondfire.helpbot.bot.command.impl.other.mod.MuteCommand;
 import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/PermissionCheck.java b/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/PermissionCheck.java
index e80f1642..c233a1e7 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/PermissionCheck.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/executor/checks/PermissionCheck.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.executor.checks;
 
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
 import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
@@ -8,7 +9,8 @@ public class PermissionCheck implements CommandCheck {
     
     @Override
     public boolean check(CommandEvent event) {
-        return event.getCommand().getPermission().hasPermission(event.getMember());
+        return event.getCommand().getPermission().hasPermission(event.getMember())
+            || Permission.getOverrides(event.getCommand()).contains(event.getAuthor().getIdLong());
     }
     
     @Override
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/SubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/SubCommand.java
new file mode 100644
index 00000000..52771daa
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/SubCommand.java
@@ -0,0 +1,4 @@
+package com.diamondfire.helpbot.bot.command.impl;
+
+public abstract class SubCommand extends Command {
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/SubCommandHolder.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/SubCommandHolder.java
new file mode 100644
index 00000000..babcf0a8
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/SubCommandHolder.java
@@ -0,0 +1,35 @@
+package com.diamondfire.helpbot.bot.command.impl;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.CommandHandler;
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.SubCommandArgument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+
+import java.util.*;
+
+public abstract class SubCommandHolder extends Command {
+
+    @Override
+    public ArgumentSet compileArguments() {
+        return new ArgumentSet().addArgument(
+                "subcommand", new SubCommandArgument()
+        );
+    }
+
+    @Override
+    public void run(CommandEvent event) {
+        SubCommand subcommand = event.getArgument("subcommand");
+        event.setCommand(subcommand);
+    
+        String[] rawArgs = event.getRawArgs();
+        rawArgs[0] = rawArgs[0].substring(HelpBotInstance.getConfig().getPrefix().length());
+        
+        List<String> args = new ArrayList<>(Arrays.asList(rawArgs));
+        args.remove(1);
+
+        CommandHandler.getInstance().run(event, args.toArray(String[]::new));
+    }
+
+    public abstract SubCommand[] getSubCommands();
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/AbstractSingleQueryCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/AbstractSingleQueryCommand.java
index ce6c27ed..d62746a8 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/AbstractSingleQueryCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/AbstractSingleQueryCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.codeblock;
 
+import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.MessageArgument;
 import com.diamondfire.helpbot.bot.command.impl.Command;
@@ -9,9 +10,13 @@
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.CodeDatabase;
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.datatypes.CodeObject;
 import com.diamondfire.helpbot.df.codeinfo.viewables.BasicReaction;
-import com.diamondfire.helpbot.sys.reactions.impl.ReactionHandler;
+import com.diamondfire.helpbot.sys.interaction.button.ButtonHandler;
 import com.diamondfire.helpbot.util.*;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 
 import java.util.*;
 import java.util.function.BiConsumer;
@@ -20,15 +25,14 @@
 
 public abstract class AbstractSingleQueryCommand extends Command {
     
-    public static void sendMultipleMessage(List<CodeObject> actions, TextChannel channel, long userToWait, BiConsumer<CodeObject, TextChannel> onChosen) {
+    public static void sendMultipleMessage(List<CodeObject> actions, GuildMessageChannel channel, long userToWait, BiConsumer<CodeObject, GuildMessageChannel> onChosen) {
         // This here is to determine if all the duplicate types are the same. If not, we need to make sure that we filter those out first..
         CodeObject referenceData = actions.get(0);
         Class<? extends CodeObject> classReference = referenceData.getClass();
-        Map<BasicReaction, CodeObject> emojis = new HashMap<>();
         PresetBuilder preset = new PresetBuilder();
         preset.withPreset(
                 new InformativeReply(InformativeReplyType.INFO, "Duplicate Objects Detected!",
-                        "What you are searching for contains a duplicate entry, please react accordingly so I can figure out what you are looking for.")
+                        "What you are searching for contains a duplicate entry. Let's narrow down your search.")
         );
         
         boolean isSameType = true;
@@ -39,42 +43,33 @@ public static void sendMultipleMessage(List<CodeObject> actions, TextChannel cha
             }
         }
         //If they are the same type, use the dupe emojis for that certain action type.
+        Map<String, CodeObject> buttonMap = new HashMap<>();
+        List<Button> buttons = new ArrayList<>();
         if (isSameType) {
-            emojis.putAll(referenceData.getEnum().getEmbedBuilder().generateDupeEmojis(actions));
+            for (Map.Entry<BasicReaction, CodeObject> reaction : referenceData.getEnum().getEmbedBuilder().generateDupeEmojis(actions).entrySet()) {
+                Button button = Button.secondary(reaction.getKey().toString(), reaction.getValue().getName());
+                
+                buttons.add(button.withEmoji(Emoji.fromCustom(reaction.getKey().getEmote())));
+                buttonMap.put(button.getCustomId(), reaction.getValue());
+            }
         } else {
             for (CodeObject data : actions) {
-                emojis.put(new BasicReaction(data.getEnum().getEmoji()), data);
+                long emoji = data.getEnum().getEmoji();
+                Button button = Button.secondary(String.valueOf(data.getEnum().getEmoji()), data.getName());
+                
+                buttons.add(button.withEmoji(HelpBotInstance.getJda().getEmojiById(emoji)));
+                buttonMap.put(button.getCustomId(), data);
             }
         }
         
-        List<String> options = new ArrayList<>();
-        for (Map.Entry<BasicReaction, CodeObject> emoji : emojis.entrySet()) {
-            options.add(emoji.getKey().toString() + " - " + emoji.getValue().getName());
-        }
-        preset.getEmbed().addField("**Options**", StringUtil.listView("", options), false);
-        
-        channel.sendMessage(preset.getEmbed().build()).queue((message) -> {
-            ReactionHandler.waitReaction(userToWait, message, (event) -> {
+        channel.sendMessageEmbeds(preset.getEmbed().build()).setComponents(ActionRow.of(buttons)).queue((message) -> {
+            ButtonHandler.addListener(userToWait, message, (event) -> {
                 message.delete().queue();
                 
                 // when msg is deleted causes nullpointer when tries to remove reactions! FIX
-                List<CodeObject> filteredData = new ArrayList<>();
-                for (Map.Entry<BasicReaction, CodeObject> emoji : emojis.entrySet()) {
-                    if (emoji.getKey().equalToReaction(event.getReactionEvent().getReactionEmote())) {
-                        filteredData.add(emoji.getValue());
-                    }
-                }
-                
-                if (filteredData.size() == 1) {
-                    onChosen.accept(filteredData.get(0), message.getTextChannel());
-                } else {
-                    sendMultipleMessage(filteredData, message.getTextChannel(), userToWait, onChosen);
-                }
-                
+                CodeObject object = buttonMap.get(event.getComponentId());
+                onChosen.accept(object, message.getChannel().asGuildMessageChannel());
             });
-            for (BasicReaction reaction : emojis.keySet()) {
-                reaction.react(message).queue();
-            }
         });
         
     }
@@ -91,9 +86,9 @@ public void run(CommandEvent event) {
         getData(event, onDataReceived());
     }
     
-    public abstract BiConsumer<CodeObject, TextChannel> onDataReceived();
+    public abstract BiConsumer<CodeObject, GuildMessageChannel> onDataReceived();
     
-    protected void getData(CommandEvent event, BiConsumer<CodeObject, TextChannel> onChosen) {
+    protected void getData(CommandEvent event, BiConsumer<CodeObject, GuildMessageChannel> onChosen) {
         String name = event.getArgument("name");
         PresetBuilder preset = new PresetBuilder();
         
@@ -126,9 +121,9 @@ protected void getData(CommandEvent event, BiConsumer<CodeObject, TextChannel> o
                 
                 // If none, proceed. Else we need to special case that.
                 if (sameActions.size() == 1) {
-                    onChosen.accept(sameActions.get(0), event.getChannel());
+                    onChosen.accept(sameActions.get(0), event.getChannel().asGuildMessageChannel());
                 } else if (sameActions.size() > 1) {
-                    sendMultipleMessage(sameActions, event.getChannel(), event.getMember().getIdLong(), onChosen);
+                    sendMultipleMessage(sameActions, event.getChannel().asGuildMessageChannel(), event.getMember().getIdLong(), onChosen);
                 }
                 
                 return;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/CodeCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/CodeCommand.java
index 4c54efb3..cde99c68 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/CodeCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/CodeCommand.java
@@ -6,7 +6,9 @@
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.datatypes.CodeObject;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.io.File;
 import java.util.function.BiConsumer;
@@ -14,17 +16,17 @@
 
 public class CodeCommand extends AbstractSingleQueryCommand {
     
-    public static <T extends CodeObject> void sendHelpMessage(T data, TextChannel channel) {
+    public static <T extends CodeObject> void sendHelpMessage(T data, GuildMessageChannel channel) {
         EmbedBuilder builder = data.getEnum().getEmbedBuilder().generateEmbed(data);
         String customHead = data.getItem().getHead();
         
         if (customHead == null) {
             File actionIcon = Util.fetchMinecraftTextureFile(data.getItem().getMaterial().toUpperCase());
             builder.setThumbnail("attachment://" + actionIcon.getName());
-            channel.sendMessage(builder.build()).addFile(actionIcon).queue();
+            channel.sendMessageEmbeds(builder.build()).addFiles(FileUpload.fromData(actionIcon)).queue();
         } else {
             builder.setThumbnail(customHead);
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
         }
         
     }
@@ -56,7 +58,7 @@ public void run(CommandEvent event) {
     }
     
     @Override
-    public BiConsumer<CodeObject, TextChannel> onDataReceived() {
+    public BiConsumer<CodeObject, GuildMessageChannel> onDataReceived() {
         return CodeCommand::sendHelpMessage;
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/RawCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/RawCommand.java
index 8f4c5bd7..2be76c85 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/RawCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/RawCommand.java
@@ -6,14 +6,15 @@
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.datatypes.CodeObject;
 import com.diamondfire.helpbot.util.StringUtil;
 import com.google.gson.*;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 
 import java.util.function.BiConsumer;
 
 
 public class RawCommand extends AbstractSingleQueryCommand {
     
-    private static void sendRawMessage(CodeObject data, TextChannel channel) {
+    private static void sendRawMessage(CodeObject data, GuildMessageChannel channel) {
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
         String json = gson.toJson(data.getJson());
         
@@ -55,7 +56,7 @@ public void run(CommandEvent event) {
     }
     
     @Override
-    public BiConsumer<CodeObject, TextChannel> onDataReceived() {
+    public BiConsumer<CodeObject, GuildMessageChannel> onDataReceived() {
         return RawCommand::sendRawMessage;
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/TagsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/TagsCommand.java
index 32edad71..d7a84a72 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/TagsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/TagsCommand.java
@@ -6,7 +6,9 @@
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.datatypes.*;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.io.File;
 import java.util.function.BiConsumer;
@@ -14,7 +16,7 @@
 
 public class TagsCommand extends AbstractSingleQueryCommand {
     
-    private static void sendTagMessage(CodeObject data, TextChannel channel) {
+    private static void sendTagMessage(CodeObject data, GuildMessageChannel channel) {
         EmbedBuilder builder = new EmbedBuilder();
         ActionData actionData;
         
@@ -26,14 +28,14 @@ private static void sendTagMessage(CodeObject data, TextChannel channel) {
         } else {
             builder.setTitle("Invalid data!");
             builder.setDescription("What you have searched for is not a valid action!");
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
             return;
         }
         
         if (actionData.getTags().length == 0) {
             builder.setTitle("No tags!");
             builder.setDescription("This action does not contain any tags!");
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
             return;
         }
         
@@ -52,10 +54,10 @@ private static void sendTagMessage(CodeObject data, TextChannel channel) {
         if (customHead == null) {
             File actionIcon = Util.fetchMinecraftTextureFile(data.getItem().getMaterial().toUpperCase());
             builder.setThumbnail("attachment://" + actionIcon.getName());
-            channel.sendMessage(builder.build()).addFile(actionIcon).queue();
+            channel.sendMessageEmbeds(builder.build()).addFiles(FileUpload.fromData(actionIcon)).queue();
         } else {
             builder.setThumbnail(customHead);
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
         }
     }
     
@@ -77,7 +79,7 @@ public String getName() {
     
     @Override
     public String[] getAliases() {
-        return new String[]{"codetags", "tag"};
+        return new String[]{"codetags"};
     }
     
     @Override
@@ -91,7 +93,7 @@ public void run(CommandEvent event) {
     }
     
     @Override
-    public BiConsumer<CodeObject, TextChannel> onDataReceived() {
+    public BiConsumer<CodeObject, GuildMessageChannel> onDataReceived() {
         return TagsCommand::sendTagMessage;
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/DiscussionMuteCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/DiscussionMuteCommand.java
deleted file mode 100644
index ec3118e8..00000000
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/DiscussionMuteCommand.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
-
-import com.diamondfire.helpbot.bot.HelpBotInstance;
-import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
-import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
-import com.diamondfire.helpbot.bot.command.argument.impl.types.*;
-import com.diamondfire.helpbot.bot.command.help.*;
-import com.diamondfire.helpbot.bot.command.impl.Command;
-import com.diamondfire.helpbot.bot.command.permissions.Permission;
-import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
-import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
-import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
-import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
-import com.diamondfire.helpbot.sys.tasks.impl.MuteExpireTask;
-import com.diamondfire.helpbot.util.*;
-import net.dv8tion.jda.api.entities.*;
-
-import java.time.*;
-import java.time.temporal.TemporalAdjusters;
-import java.util.Date;
-
-public class DiscussionMuteCommand extends Command {
-    
-    public static final long DISCUSSION_CHANNEL = HelpBotInstance.getConfig().getDiscussionChannel();
-    
-    @Override
-    public String getName() {
-        return "discussionmute";
-    }
-    
-    @Override
-    public String[] getAliases() {
-        return new String[]{"weeklymute", "weekmute", "discmute"};
-    }
-    
-    @Override
-    public HelpContext getHelpContext() {
-        return new HelpContext()
-                .description("Mutes a player from discussion till the next Monday 6PM EST.")
-                .category(CommandCategory.OTHER)
-                .addArgument(
-                        new HelpContextArgument()
-                                .name("user"),
-                        new HelpContextArgument()
-                                .name("duration")
-                );
-    }
-    
-    @Override
-    protected ArgumentSet compileArguments() {
-        LocalDate nextMonday = LocalDate.now().with(TemporalAdjusters.next(DayOfWeek.MONDAY));
-        
-        return new ArgumentSet()
-                .addArgument("user",
-                        new DiscordUserArgument())
-                .addArgument("duration",
-                        new SingleArgumentContainer<>(new TimeOffsetArgument()).optional(DateUtil.toDate(nextMonday)));
-    }
-    
-    @Override
-    public Permission getPermission() {
-        return Permission.MODERATION;
-    }
-    
-    @Override
-    public void run(CommandEvent event) {
-        PresetBuilder builder = new PresetBuilder();
-        long user = event.getArgument("user");
-        Date duration = event.getArgument("duration");
-        long timeLeft = duration.toInstant().minusSeconds(Instant.now().getEpochSecond()).toEpochMilli();
-        
-        event.getGuild().retrieveMemberById(user).queue((msg) -> {
-            new DatabaseQuery()
-                    .query(new BasicQuery("INSERT INTO owen.muted_members (member,muted_by,muted_at,muted_till,reason) VALUES (?,?,CURRENT_TIMESTAMP(),?,'Weekly Discussion Mute')", (statement) -> {
-                        statement.setLong(1, user);
-                        statement.setLong(2, event.getAuthor().getIdLong());
-                        statement.setTimestamp(3, DateUtil.toTimeStamp(duration));
-                        
-                    }))
-                    .compile();
-            
-            builder.withPreset(
-                    new InformativeReply(InformativeReplyType.SUCCESS, "Muted!", String.format("Player will be muted for ``%s``.", FormatUtil.formatMilliTime(timeLeft)))
-            );
-            Guild guild = event.getGuild();
-            TextChannel channel = guild.getTextChannelById(DISCUSSION_CHANNEL);
-            guild.retrieveMemberById(user).queue((member) -> {
-                channel.putPermissionOverride(member).deny(net.dv8tion.jda.api.Permission.MESSAGE_ADD_REACTION, net.dv8tion.jda.api.Permission.MESSAGE_WRITE).queue();
-            });
-            
-            HelpBotInstance.getScheduler().schedule(new MuteExpireTask(user, duration, true));
-            event.reply(builder);
-        }, (error) -> {
-            builder.withPreset(
-                    new InformativeReply(InformativeReplyType.ERROR, "Discord user was not found!")
-            );
-            
-            event.reply(builder);
-        });
-        
-    }
-}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/FetchDataCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/FetchDataCommand.java
deleted file mode 100644
index f8b02db6..00000000
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/FetchDataCommand.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
-
-import com.diamondfire.helpbot.bot.HelpBotInstance;
-import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
-import com.diamondfire.helpbot.bot.command.help.*;
-import com.diamondfire.helpbot.bot.command.impl.Command;
-import com.diamondfire.helpbot.bot.command.permissions.Permission;
-import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.df.codeinfo.codedatabase.changelog.CodeDifferenceHandler;
-import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.CodeDatabase;
-import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
-import com.diamondfire.helpbot.util.PlainComponentSerializer;
-import com.github.steveice10.mc.auth.exception.request.RequestException;
-import com.github.steveice10.mc.protocol.MinecraftProtocol;
-import com.github.steveice10.mc.protocol.data.game.MessageType;
-import com.github.steveice10.mc.protocol.packet.ingame.client.ClientChatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.server.*;
-import com.github.steveice10.packetlib.*;
-import com.github.steveice10.packetlib.event.session.*;
-import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.tcp.TcpSessionFactory;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.*;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-
-
-public class FetchDataCommand extends Command {
-    
-    private static final String USERNAME = HelpBotInstance.getConfig().getMcEmail();
-    private static final String PASSWORD = HelpBotInstance.getConfig().getMcPassword();
-    private final ArrayList<String> queue = new ArrayList<>();
-    private boolean ready = false;
-    
-    @Override
-    public String getName() {
-        return "fetch";
-    }
-    
-    @Override
-    public HelpContext getHelpContext() {
-        return new HelpContext()
-                .description("Fetches data from node beta, then saves it as the current db.")
-                .category(CommandCategory.OTHER);
-    }
-    
-    @Override
-    public ArgumentSet compileArguments() {
-        return new ArgumentSet();
-    }
-    
-    @Override
-    public Permission getPermission() {
-        return Permission.BOT_DEVELOPER;
-    }
-    
-    @Override
-    public void run(CommandEvent event) {
-        setup(event.getChannel());
-    }
-    
-    public void setup(TextChannel channel) {
-        EmbedBuilder builder = new EmbedBuilder();
-        
-        builder.setTitle("Fetching Code Database...");
-        builder.setDescription("Please wait a moment!");
-        
-        Message sentMessage = channel.sendMessage(builder.build()).complete();
-        
-        try {
-            start(sentMessage);
-        } catch (Exception exception) {
-            error(sentMessage, exception);
-            return;
-        }
-        
-        status(sentMessage, String.format("Data has been received, parsing %s lines...", queue.size()));
-        
-        File file = ExternalFiles.DB;
-        
-        CodeDifferenceHandler.setComparer(file);
-        
-        try {
-            if (file.exists()) {
-                file.delete();
-            }
-            file.createNewFile();
-            
-            try (BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file.getPath(), true))) {
-                for (String s : queue) {
-                    bufferedWriter.append(s);
-                }
-                
-            }
-            
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        status(sentMessage, "Restarting and comparing code database...");
-        CodeDatabase.initialize();
-        CodeDifferenceHandler.refresh();
-        status(sentMessage, "Finished!");
-        
-        queue.clear();
-    }
-    
-    private void start(Message message) throws RequestException {
-        MinecraftProtocol protocol = new MinecraftProtocol(USERNAME, PASSWORD);
-        Client client = new Client("beta.mcdiamondfire.com", 25565, protocol, new TcpSessionFactory());
-        Session session = client.getSession();
-        
-        status(message, "Connecting to DiamondFire...");
-        ready = false;
-        
-        client.getSession().connect();
-        client.getSession().addListener(new SessionAdapter() {
-            @Override
-            public void packetReceived(PacketReceivedEvent event) {
-                Packet packet = event.getPacket();
-                
-                if (packet instanceof ServerJoinGamePacket) {
-                    status(message, "Joined server!");
-                    try {
-                        Thread.sleep(2000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    event.getSession().send(new ClientChatPacket("/chat none"));
-                    event.getSession().send(new ClientChatPacket("/dumpactioninfo"));
-                }
-                
-                if (packet instanceof ServerChatPacket) {
-                    ServerChatPacket chatPacket = event.getPacket();
-                    String text = PlainComponentSerializer.INSTANCE.serialize(chatPacket.getMessage());
-                    
-                    if (chatPacket.getType() == MessageType.NOTIFICATION) return;
-                    
-                    if (text.contains("Unknown command!")) {
-                        throw new IllegalStateException("Command not found!");
-                    }
-                    
-                    if (text.startsWith("{")) {
-                        status(message, "Receiving data...");
-                        ready = true;
-                    } else if (text.startsWith("}")) {
-                        session.disconnect("HelpBot data collection has concluded. ");
-                    }
-                    
-                    if (ready) {
-                        queue.add(new String(text.getBytes(StandardCharsets.UTF_8)));
-                    }
-                    
-                }
-            }
-        });
-        
-        while (session.isConnected()) {
-            try {
-                Thread.sleep(1);
-            } catch (Exception ignored) {
-            }
-        }
-        
-        if (queue.isEmpty()) {
-            throw new IllegalStateException("Failed to retrieve data");
-        }
-        
-    }
-    
-    private void error(Message message, Exception e) {
-        EmbedBuilder builder = new EmbedBuilder();
-        builder.setTitle("Error occurred!");
-        builder.setDescription(e.getMessage());
-        message.editMessage(builder.build()).queue();
-        e.printStackTrace();
-    }
-    
-    private void status(Message message, String status) {
-        EmbedBuilder builder = new EmbedBuilder();
-        builder.setTitle("Status");
-        builder.setDescription(status);
-        message.editMessage(builder.build()).queue();
-    }
-    
-}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/IdeaCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/IdeaCommand.java
deleted file mode 100644
index c8144dbd..00000000
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/IdeaCommand.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
-
-import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
-import com.diamondfire.helpbot.bot.command.help.*;
-import com.diamondfire.helpbot.bot.command.impl.Command;
-import com.diamondfire.helpbot.bot.command.permissions.Permission;
-import com.diamondfire.helpbot.bot.events.CommandEvent;
-import net.dv8tion.jda.api.EmbedBuilder;
-import java.util.Random;
-
-public class IdeaCommand extends Command {
-    
-    @Override
-    public String getName() {
-        return "idea";
-    }
-    
-    @Override
-    public HelpContext getHelpContext() {
-        return new HelpContext()
-                .description("Generates a genius game idea.")
-                .category(CommandCategory.OTHER);
-    }
-    
-    @Override
-    public ArgumentSet compileArguments() {
-        return new ArgumentSet();
-    }
-    
-    @Override
-    public Permission getPermission() {
-        return Permission.USER;
-    }
-    
-    @Override
-    public void run(CommandEvent event) {
-        
-        String[] types = new String[]{
-                "A clicker game",
-                "A building game",
-                "A snowy game",
-                "A survival game",
-                "A parkour course",
-                "A puzzle game",
-                "A creative game",
-                "A battle royale game",
-                "A sandbox game",
-                "A sunny game",
-                "An extremely hot game",
-                "An exploration game",
-                "A dungeon game",
-                "A grass game",
-                "A Dutch game",
-                "A cultured game",
-                "An old game",
-                "A recreated game",
-                "A friendly game",
-                "An angry game",
-                "A PVP game",
-                "A procedurally generated game",
-                "A simulator game",
-                "A tower defence game",
-                "A sandbox game",
-                "A top-down game",
-                "A first-person shooter",
-                "An RPG game",
-                "A Metroidvania game",
-                "A rogue-lite game",
-                "A casual game",
-                "A farming game",
-                "A city builder game",
-                "A rhythm game",
-                "A point & click game",
-                "An arcade game",
-                "A co-op game",
-                "A stealth game",
-                "A board game",
-                "A text-based game",
-                "A horror game",
-                "An educational game",
-                "A turn-based game",
-                "A strategy game",
-                "A bullet hell game",
-                "A skyblock game",
-                "An educational game",
-                "A generic wire game",
-                "A grindy game"
-        };
-        String[] objectives = new String[]{
-                "where you adopt hamsters",
-                "where you build structures",
-                "where you build a snowman",
-                "where you connect wires",
-                "where you play Fortnite",
-                "where you murder others",
-                "where you act to jump",
-                "where you disguise as a Lander",
-                "where you chill out",
-                "where you run for your life",
-                "where you party with blocks",
-                "where you punch flowers",
-                "where you raid Area 51",
-                "where you swipe Jeremaster to the left",
-                "where you explore dungeons",
-                "where you kill monsters",
-                "where you attack the DiamondFire Moderator team",
-                "where you send a love letter",
-                "where you express love",
-                "where you can't enter buildings",
-                "where you dance",
-                "where you are sus",
-                "where you sing",
-                "where you grill steak",
-                "where you fight squids",
-                "where you break the 4th wall",
-                "where you make an unscripted rant",
-                "where you craft items",
-                "where you can't move",
-                "where you can't jump",
-                "where DFIdentity hunts you down",
-                "where you control a dolphin",
-                "where you need a key",
-                "where you always swim",
-                "where you read a Buzzfeed article",
-                "where you become a robot",
-                "where you need to escape",
-                "where you shoot missiles",
-                "where you watch TV",
-                "where you wear gold armour",
-                "where you are American",
-                "where you are British",
-                "where you fight in World War 2",
-                "where you delete builds",
-                "where you abuse glitches",
-                "where you have half a heart",
-                "where you have a midlife crisis",
-                "where you spawn fiery diamonds",
-                "where you mine a lot of redstone",
-                "where you speedrun it",
-                "where you have to leave the plot",
-                "where you are staff",
-                "where you break people's hearts",
-                "where you rap like a god",
-                "where Ottelino rejoins the discord yet again",
-                "where you join the events team",
-                "where you get Discord Nitro",
-                "where you post clips",
-                "where you contribute to HelpBot",
-                "where Fejiberglibstein gives you big crazies",
-                "where Refriz says uwu",
-                "where you request support",
-                "where you ban people",
-                "where you post memes",
-                "where you go on a DiamondFire rant",
-                "where you perform big codes",
-                "where you break HelpBot",
-                "where you do the RyanLand",
-                "where you become a redditor",
-                "where you retire",
-                "where you generate samquotes",
-                "where you accidentally the cat",
-                "where Owen posts another strange video",
-                "where you admire hedgehogs",
-                "where you wear a mask",
-                "where you set a computer on fire",
-        };
-        String[] rewards = new String[]{
-                "for pleasure.",
-                "with RyanLand <3.",
-                "with Jeremaster.",
-                "for 50 tokens.",
-                "for the next level.",
-                "to unlock Player Action: Send Title.",
-                "to unlock the Midas Touch cosmetic.",
-                "for all colors of the rainbow.",
-                "for coins.",
-                "for gold.",
-                "for grandma's cookies.",
-                "to see ET.",
-                "for a trip to Amsterdam.",
-                "for a ticket to see Jeremaster's movie.",
-                "for a lot of free kaasblokjes.",
-                "for diamonds straight from the mine.",
-                "for Owen's cookies.",
-                "for admin.",
-                "for the memes.",
-                "for a lot of exposure on Wall Street.",
-                "for a gift with chocolate.",
-                "to unlock a new cosmetic.",
-                "for a large shoutout.",
-                "for an exclusive gadget.",
-                "to receive a gangster drip.",
-                "for a concert with Eminem.",
-                "for a private concert with MrMine05.",
-                "for money.",
-                "for a ban from DiamondFire.",
-                "for a Kick of Truth from lukecashwell.",
-                "for a big prize.",
-                "for an exclusive BuzzFeed article.",
-                "for Develoepr.",
-                "with a turtle.",
-                "with friends.",
-                "with a very big elephant.",
-                "for a small compliment.",
-                "for a troll.",
-                "for the fall of death.",
-                "for a visit to prison.",
-                "to visit McDonalds.",
-                "for a big McChicken burger.",
-                "for an egg from a chicken.",
-                "for another plot.",
-                "for a neat firework show.",
-                "to listen to Pigstep.",
-                "for a show from DJ RyanLand.",
-                "for a bunch of ducks saying quack.",
-                "for good game ideas.",
-                "for a volcano eruption.",
-                "for the new DiamondFire update.",
-                "to get banned.",
-                "for samquotes.",
-                "for love.",
-                "for Robot Game levels.",
-                "for Hypercube source code.",
-                "for warm blankets.",
-                "for the labsCore API.",
-                "for V-Bucks.",
-                "to get hugs from Owen.",
-                "to eat food.",
-                "for red pandas",
-                "to avoid COVID-19",
-        };
-        
-        Random rdm = new Random();
-        EmbedBuilder builder = new EmbedBuilder();
-        
-        builder.setTitle("Idea");
-        builder.setDescription(types[rdm.nextInt(types.length)] + " " + objectives[rdm.nextInt(objectives.length)] + " " + rewards[rdm.nextInt(rewards.length)]);
-        
-        event.getChannel().sendMessage(builder.build()).queue();
-    }
-    
-}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/NbsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/NbsCommand.java
deleted file mode 100644
index 5da1bebe..00000000
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/NbsCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
-
-import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
-import com.diamondfire.helpbot.bot.command.help.CommandCategory;
-import com.diamondfire.helpbot.bot.command.help.HelpContext;
-import com.diamondfire.helpbot.bot.command.impl.Command;
-import com.diamondfire.helpbot.bot.command.permissions.Permission;
-import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
-import com.diamondfire.helpbot.bot.command.reply.feature.informative.InformativeReply;
-import com.diamondfire.helpbot.bot.command.reply.feature.informative.InformativeReplyType;
-import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.util.nbs.*;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.TextChannel;
-
-import java.awt.*;
-import java.io.*;
-import java.net.*;
-import java.nio.charset.StandardCharsets;
-
-import java.util.Scanner;
-
-public class NbsCommand extends Command {
-    
-    @Override
-    public String getName() {
-        return "nbs";
-    }
-    
-    @Override
-    public HelpContext getHelpContext() {
-        return new HelpContext()
-                .description("Generates a Codeutils song function.")
-                .category(CommandCategory.OTHER);
-    }
-    
-    @Override
-    protected ArgumentSet compileArguments() { return new ArgumentSet(); }
-    
-    @Override
-    public Permission getPermission() { return Permission.USER; }
-    
-    @Override
-    public void run(CommandEvent event) {
-        TextChannel channel = event.getChannel();
-        PresetBuilder nbsPreset = new PresetBuilder()
-            .withPreset(new InformativeReply(InformativeReplyType.ERROR,"You need to attach an nbs file!"));
-        PresetBuilder error = new PresetBuilder()
-            .withPreset(new InformativeReply(InformativeReplyType.ERROR,"Something went wrong while processing/generating!"));
-        
-        if(event.getMessage().getAttachments().isEmpty()) {
-            event.reply(nbsPreset);
-            return;
-        }
-        Message.Attachment attachment = event.getMessage().getAttachments().get(0);
-        if(!attachment.getFileExtension().equals("nbs")) {
-            event.reply(nbsPreset);
-            return;
-        }
-        
-        try {
-            File file = new File("input.nbs");
-            attachment.downloadToFile(file).thenAccept((downloadedFile) -> {
-                try {
-                    String code = new NBSToTemplate(NBSDecoder.parse(file)).convert();
-                    byte[] b64 = CompressionUtil.toBase64(CompressionUtil.toGZIP(code.getBytes(StandardCharsets.UTF_8)));
-                    String templateJson = String.format("{\"template\": \"%s\",\"temp\": true}",new String(b64));
-                    JsonObject json = new Gson().fromJson(generateLink(templateJson),JsonObject.class);
-                    
-                    EmbedBuilder embed = new EmbedBuilder()
-                            .setColor(new Color(70,199,82))
-                            .setTitle("Template Generated!")
-                            .setThumbnail("https://static.wikia.nocookie.net/minecraft/images/9/9b/Note_Block.png/revision/latest?cb=20190921170620")
-                            .addField("Link: __Expires in 2 minutes__","[Template Link](https://derpystuff.gitlab.io/code/l?link=" + json.get("link").getAsString() + ")",false)
-                            .addField("Info:","Click the link shown above and click the button in the bottom left corner to copy the give command for the template. You will need [this function](https://derpystuff.gitlab.io/code/l?link=7cf5d91c35bbde31c28567d8d8945c40) to play songs.",false);
-                    
-                    channel.sendMessage(embed.build()).queue();
-                } catch(OutdatedNBSException | IOException e) {
-                    e.printStackTrace();
-                    event.reply(error);
-                }
-            });
-        } catch(Exception e) {
-            e.printStackTrace();
-            event.reply(error);
-        }
-        
-    }
-    
-    private static String generateLink(String templateData) throws IOException {
-        URL url = new URL("https://twv.vercel.app/v2/create");
-        URLConnection con = url.openConnection();
-        HttpURLConnection http = (HttpURLConnection) con;
-        http.setRequestMethod("POST");
-        http.setDoOutput(true);
-        byte[] out = templateData.getBytes(StandardCharsets.UTF_8);
-        int length = out.length;
-        http.setFixedLengthStreamingMode(length);
-        http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-        http.setRequestProperty("Accept","application/json; charset=UTF-8");
-        http.connect();
-        try(OutputStream os = http.getOutputStream()) {
-            os.write(out);
-        }
-        Scanner s = new Scanner(http.getInputStream()).useDelimiter("\\A");
-        String result = s.hasNext() ? s.next() : "";
-        s.close();
-        http.disconnect();
-        
-        return result;
-    }
-}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/SamQuotesCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/SamQuotesCommand.java
deleted file mode 100644
index 2dfd60f6..00000000
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/SamQuotesCommand.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
-
-import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
-import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
-import com.diamondfire.helpbot.bot.command.argument.impl.types.DefinedObjectArgument;
-import com.diamondfire.helpbot.bot.command.help.*;
-import com.diamondfire.helpbot.bot.command.impl.Command;
-import com.diamondfire.helpbot.bot.command.permissions.Permission;
-import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
-import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
-import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
-import com.diamondfire.helpbot.util.IOUtil;
-import net.dv8tion.jda.api.EmbedBuilder;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.geom.Ellipse2D;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-
-import static com.diamondfire.helpbot.util.textgen.CacheData.CacheData; //use this if you want to add more data to ai sam
-import static com.diamondfire.helpbot.util.textgen.MarkovManipulation.getNextWord;
-
-public class SamQuotesCommand extends Command {
-    
-    private static final Random random = new Random();
-    
-    @Override
-    public String getName() {
-        return "samquote";
-    }
-    
-    @Override
-    public HelpContext getHelpContext() {
-        return new HelpContext()
-                .description("Gets a quote from Sam the Man.")
-                .category(CommandCategory.OTHER)
-                .addArgument(
-                        new HelpContextArgument()
-                                .name("get"),
-                        new HelpContextArgument()
-                                .name("submit"),
-                        new HelpContextArgument()
-                                .name("generate"));
-    }
-    
-    @Override
-    public Permission getPermission() {
-        return Permission.USER;
-    }
-    
-    @Override
-    public void run(CommandEvent event) {
-        
-        if (event.getArgument("action") == null) {
-    
-            String[] strings = ExternalFiles.SAM_DIR.list();
-            File file = new File(ExternalFiles.SAM_DIR, strings[random.nextInt(strings.length)]);
-            EmbedBuilder builder = new EmbedBuilder();
-            builder.setTitle("Sam Quote");
-            builder.setImage("attachment://quote.png");
-            builder.setColor(new Color(87, 177, 71));
-    
-            event.getChannel().sendMessage(builder.build()).addFile(file, "quote.png").queue();
-    
-        } else if (event.getArgument("action").equals("submit")) {
-            
-            String[] message = event.getMessage().getContentRaw().split("/");
-            
-            if(message.length != 7 || message[5] == null || message[6] == null || message[5].length() != 18 || message[6].length() != 18) {
-    
-                PresetBuilder error = new PresetBuilder();
-                
-                error.withPreset(
-                        new InformativeReply(InformativeReplyType.ERROR, "This is not a samquote!")
-                );
-                
-                event.reply(error);
-                
-                return;
-            }
-            
-            long channelID = Long.parseLong(message[5]);
-            long messageID = Long.parseLong(message[6]);
-            
-            event.getGuild().getTextChannelById(channelID).retrieveMessageById(messageID).queue((messageText) -> {
-                
-                if(messageText.getAuthor().getIdLong() == 132092551782989824L) {
-                    
-                    try {
-                        
-                        BufferedImage samPfp = ImageIO.read(ExternalFiles.SAMMAN);
-                        
-                        String text = "           " + messageText.getContentRaw().replaceAll("[^a-zA-Z0-9 ]", "");
-    
-                        int pfpWidth = samPfp.getWidth() * 10;
-    
-                        //crop pfp into a circle
-    
-                        BufferedImage circleBuffer = new BufferedImage(pfpWidth, pfpWidth, BufferedImage.TYPE_INT_ARGB);
-                        Graphics2D g2 = circleBuffer.createGraphics();
-    
-                        g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-                        g2.setClip(new Ellipse2D.Float(0, 0, pfpWidth, pfpWidth));
-                        g2.drawImage(samPfp, 0, 0, pfpWidth, pfpWidth, null);
-    
-                        //convert text into image
-    
-                        BufferedImage img = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
-    
-                        Graphics2D g2d = img.createGraphics();
-    
-                        Font font = new Font("Whitney", Font.PLAIN, 140);
-                        g2d.setFont(font);
-                        FontMetrics fm = g2d.getFontMetrics();
-    
-                        int width = fm.stringWidth(text);
-                        int height = fm.getHeight() * 2;
-    
-                        g2d.dispose();
-    
-                        img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-    
-                        g2d = img.createGraphics();
-    
-                        g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
-                        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                        g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
-                        g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
-                        g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-                        g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-                        g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-                        g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-    
-                        g2d.setFont(font);
-                        g2d.setColor(Color.WHITE);
-                        g2d.drawString(text, 0, fm.getAscent() * 2.2f);
-    
-                        g2d.dispose();
-    
-                        //convert SamMan_ into image
-    
-                        BufferedImage img2 = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
-    
-                        Graphics2D g2d2 = img2.createGraphics();
-    
-                        Font font2 = new Font("Whitney", Font.BOLD, 140);
-                        g2d2.setFont(font2);
-                        FontMetrics fm2 = g2d2.getFontMetrics();
-    
-                        int width2 = fm2.stringWidth("           SamMan_");
-                        int height2 = fm2.getHeight();
-    
-                        g2d2.dispose();
-    
-                        img2 = new BufferedImage(width2, height2, BufferedImage.TYPE_INT_ARGB);
-    
-                        g2d2 = img2.createGraphics();
-    
-                        g2d2.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
-                        g2d2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                        g2d2.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
-                        g2d2.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
-                        g2d2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-                        g2d2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-                        g2d2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-                        g2d2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-    
-                        g2d2.setFont(font);
-                        Color nameColor = new Color(45, 102, 212);
-                        g2d2.setColor(nameColor);
-                        g2d2.drawString("           SamMan_", 0, fm2.getAscent());
-    
-                        g2d2.dispose();
-    
-                        //create background image
-    
-                        BufferedImage combined = new BufferedImage(Math.max(img.getWidth(), img2.getWidth()) + 10, img.getHeight() + 10, BufferedImage.TYPE_INT_ARGB);
-    
-                        Graphics g = combined.getGraphics();
-    
-                        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    
-                        Color bgColor = new Color(54,57,63);
-    
-                        BufferedImage bg = new BufferedImage(Math.max(img.getWidth(), img2.getWidth()) + 30, height + 30, BufferedImage.TYPE_INT_ARGB);
-                        Graphics2D bgg = bg.createGraphics();
-                        bgg.setPaint (bgColor);
-                        bgg.fillRect (0, 0, bg.getWidth(), bg.getHeight());
-                        bgg.dispose();
-    
-                        //combine images
-    
-                        g.drawImage(bg, 0, 0, bgColor, null);
-                        g.drawImage(img, 5, 5, bgColor, null);
-                        g.drawImage(img2, 5, 5, bgColor, null);
-                        g.drawImage(circleBuffer, 5, 5, height, height, bgColor, null);
-                        
-                        //save image
-                        
-                        File imageFile = new File(ExternalFiles.SAM_DIR, messageText.getContentRaw().replaceAll("[^a-zA-Z0-9]", "") + ".png");
-                        ImageIO.write(combined, "PNG", imageFile);
-                        
-                        PresetBuilder success = new PresetBuilder();
-                        
-                        success.withPreset(
-                                new InformativeReply(InformativeReplyType.SUCCESS, "Your SamQuote has been added!")
-                        );
-                        
-                        event.reply(success);
-                        
-                    } catch (IOException e) {
-                        
-                        e.printStackTrace();
-                        
-                    }
-                    
-                } else {
-    
-                    PresetBuilder error = new PresetBuilder();
-    
-                    error.withPreset(
-                            new InformativeReply(InformativeReplyType.ERROR, "This is not a samquote!")
-                    );
-                    
-                    event.reply(error);
-                    
-                }
-                
-            });
-        } else if (event.getArgument("action").equals("generate")) {
-    
-            File file = new File("samquotes.txt");
-            
-            BufferedReader br = null;
-            try {
-                br = new BufferedReader(new FileReader(file));
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            
-            ArrayList<String> startingTexts = new ArrayList<>();
-    
-            String line = null;
-            while (true) {
-                try {
-                    if ((line = br.readLine()) == null) break;
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                
-                startingTexts.add(line.split(" ")[0]);
-            }
-            
-            String word = startingTexts.get((int) Math.rint(Math.random() * startingTexts.size()));
-            
-            String string = "";
-            for (int i = 0; i < 50; i++) {
-                
-                if (word == null || word.equals(".")) break;
-                string += word + " ";
-                try {
-                    word = getNextWord(word);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-    
-            BufferedImage samPfp = null;
-            try {
-                samPfp = ImageIO.read(ExternalFiles.SAMMAN);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-    
-            String text = "           " + string;
-    
-            int pfpWidth = samPfp.getWidth() * 10;
-    
-            //crop pfp into a circle
-    
-            BufferedImage circleBuffer = new BufferedImage(pfpWidth, pfpWidth, BufferedImage.TYPE_INT_ARGB);
-    
-            Graphics2D g2 = circleBuffer.createGraphics();
-    
-            g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-    
-            g2.setClip(new Ellipse2D.Float(0, 0, pfpWidth, pfpWidth));
-            g2.drawImage(samPfp, 0, 0, pfpWidth, pfpWidth, null);
-    
-            //convert text into image
-    
-            BufferedImage img = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
-    
-            Graphics2D g2d = img.createGraphics();
-    
-            Font font = new Font("Whitney", Font.PLAIN, 140);
-            g2d.setFont(font);
-            FontMetrics fm = g2d.getFontMetrics();
-    
-            int width = fm.stringWidth(text);
-            int height = fm.getHeight() * 2;
-    
-            g2d.dispose();
-    
-            img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-    
-            g2d = img.createGraphics();
-    
-            g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
-            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
-            g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
-            g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-            g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-            g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-            g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-    
-            g2d.setFont(font);
-            g2d.setColor(Color.WHITE);
-            g2d.drawString(text, 0, fm.getAscent() * 2.2f);
-    
-            g2d.dispose();
-    
-            //convert SamMan_ into image
-    
-            BufferedImage img2 = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
-    
-            Graphics2D g2d2 = img2.createGraphics();
-    
-            Font font2 = new Font("Whitney", Font.BOLD, 140);
-            g2d2.setFont(font2);
-            FontMetrics fm2 = g2d2.getFontMetrics();
-    
-            int width2 = fm2.stringWidth("           SamMan_");
-            int height2 = fm2.getHeight();
-    
-            g2d2.dispose();
-    
-            img2 = new BufferedImage(width2, height2, BufferedImage.TYPE_INT_ARGB);
-    
-            g2d2 = img2.createGraphics();
-    
-            g2d2.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
-            g2d2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            g2d2.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
-            g2d2.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
-            g2d2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-            g2d2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-            g2d2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-            g2d2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-    
-            g2d2.setFont(font);
-            
-            double colorChance = Math.random();
-    
-    
-            Color nameColor;
-            
-            if (colorChance < 0.1) {
-                
-                nameColor = new Color(255, 153, 227);
-                
-            } else if (colorChance < 0.3) {
-                
-                nameColor = new Color(255, 225, 76);
-                
-            } else if (colorChance < 0.6) {
-                
-                nameColor = new Color(35, 255, 38);
-                
-            } else {
-                
-                nameColor = new Color(45, 102, 212);
-            }
-            
-            g2d2.setColor(nameColor);
-            g2d2.drawString("           SamMan_", 0, fm2.getAscent());
-    
-            g2d2.dispose();
-    
-            //create background image
-    
-            BufferedImage combined = new BufferedImage(Math.max(img.getWidth(), img2.getWidth()) + 10, img.getHeight() + 10, BufferedImage.TYPE_INT_ARGB);
-    
-            Graphics g = combined.getGraphics();
-    
-            g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    
-            Color bgColor = new Color(54,57,63);
-    
-            BufferedImage bg = new BufferedImage(Math.max(img.getWidth(), img2.getWidth()) + 30, height + 30, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D bgg = bg.createGraphics();
-            bgg.setPaint (bgColor);
-            bgg.fillRect (0, 0, bg.getWidth(), bg.getHeight());
-            bgg.dispose();
-    
-            //combine images
-    
-            g.drawImage(bg, 0, 0, bgColor, null);
-            g.drawImage(img, 5, 5, bgColor, null);
-            g.drawImage(img2, 5, 5, bgColor, null);
-            g.drawImage(circleBuffer, 5, 5, height, height, bgColor, null);
-    
-            File samQuote = new File(ExternalFiles.IMAGES_DIR, "quote.png");
-            try {
-                ImageIO.write(combined, "PNG", samQuote);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            EmbedBuilder builder = new EmbedBuilder();
-            builder.setTitle("Sam Quote");
-            builder.setImage("attachment://quote.png");
-            builder.setColor(new Color(87, 177, 71));
-    
-            event.getChannel().sendMessage(builder.build()).addFile(samQuote, "quote.png").queue();
-        
-        } else {
-            
-            String[] strings = ExternalFiles.SAM_DIR.list();
-            File file = new File(ExternalFiles.SAM_DIR, strings[random.nextInt(strings.length)]);
-            EmbedBuilder builder = new EmbedBuilder();
-            builder.setTitle("Sam Quote");
-            builder.setImage("attachment://quote.png");
-            builder.setColor(new Color(87, 177, 71));
-            
-            event.getChannel().sendMessage(builder.build()).addFile(file, "quote.png").queue();
-            
-        }
-        
-    }
-    
-    @Override
-    public ArgumentSet compileArguments() {
-        return new ArgumentSet()
-                .addArgument("action",
-                        new SingleArgumentContainer<>(new DefinedObjectArgument<>("submit", "generate", "get")).optional(null));
-    }
-    
-}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/StoreCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/StoreCommand.java
new file mode 100644
index 00000000..9ea64109
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/StoreCommand.java
@@ -0,0 +1,92 @@
+package com.diamondfire.helpbot.bot.command.impl.other;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.util.WebUtil;
+import com.google.gson.*;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+
+import java.util.*;
+
+
+public class StoreCommand extends Command {
+    
+    @Override
+    public String getName() {
+        return "store";
+    }
+    
+    @Override
+    public String[] getAliases() {
+        return new String[]{"shop"};
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Shows all items, recent purchases and sales (if there is one) from store.mcdiamondfire.com.")
+                .category(CommandCategory.OTHER);
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet();
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        EmbedBuilder builder = new EmbedBuilder();
+        builder.setTitle("<:diamondfire:867472383098486794> DiamondFire Store <:diamondfire:867472383098486794>", "https://store.mcdiamondfire.com/");
+        builder.setDescription("Fetching store..");
+        Message message = event.getChannel().sendMessageEmbeds(builder.build()).complete();
+        try{
+            JsonObject json = WebUtil.getJson("https://df.vatten.dev/store/").getAsJsonObject();
+            builder.setTitle("<:diamondfire:867472383098486794> DiamondFire Store <:diamondfire:867472383098486794>", "https://store.mcdiamondfire.com/");
+            boolean sale = json.has("sale");
+            if(sale) builder.setDescription("\n<a:boostx3:809172442496630815> **SALE! " + (int) (json.get("sale").getAsFloat() * 100) + "% OFF!** <a:boostx3:809172442496630815>\n");
+            
+            //lazy reorganizing
+            JsonObject items = new JsonObject();
+            for(String category : new String[]{"Ranks", "Plots", "Boosters"}) {
+                items.add(category, json.getAsJsonObject("items").getAsJsonArray(category.toLowerCase()));
+            }
+            
+            HashMap<String, String> emotes = new HashMap<>();
+            emotes.put("Ranks", "<a:overlord:867780069653348402>");
+            emotes.put("Plots", "<:location:789274944923369483>");
+            emotes.put("Boosters", "<:potion:789274945162575912>");
+            
+            for(Map.Entry<String, JsonElement> category : items.entrySet()) {
+                ArrayList<String> fieldval = new ArrayList<>();
+                for(JsonElement item : category.getValue().getAsJsonArray()) {
+                    String name = item.getAsJsonObject().get("name").getAsString();
+                    String original_price = item.getAsJsonObject().get("original-price").getAsString();
+                    String discount_price = sale ? item.getAsJsonObject().get("discount-price").getAsString() : null;
+                    fieldval.add("**" + name + "**: " + (sale ? "~~$" + original_price + "~~ <a:boostx2:809172442957217812> $" + discount_price : "$" + original_price));
+                }
+                builder.addField(emotes.get(category.getKey()) + " " + category.getKey(), String.join("\n", fieldval) + "\n\u200b", false);
+            }
+            
+            ArrayList<String> fieldval = new ArrayList<>();
+            for(JsonElement purchase : json.getAsJsonArray("recent-purchases")) {
+                fieldval.add(" **" + purchase.getAsJsonObject().get("player").getAsString() + "** bought **" + purchase.getAsJsonObject().get("item").getAsString() + "**");
+            }
+            builder.addField(":partying_face: Recent Purchases", String.join("\n", fieldval), false);
+            
+            message.editMessageEmbeds(builder.build()).queue();
+        }catch(Exception e) {
+            message.editMessageEmbeds(new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR, "Failed to retrieve store items.")).getEmbed().build()).queue();
+        }
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/DisableCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/DisableCommand.java
similarity index 93%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/DisableCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/DisableCommand.java
index 1fb60755..02b56f26 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/DisableCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/DisableCommand.java
@@ -1,6 +1,5 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dev;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.StringArgument;
@@ -54,7 +53,7 @@ public void run(CommandEvent event) {
         }
         
         if (command != null) {
-            HelpBotInstance.getHandler().getDisabledHandler().disable(command);
+            CommandHandler.getInstance().getDisabledHandler().disable(command);
             builder.withPreset(new InformativeReply(InformativeReplyType.SUCCESS, String.format("Command ``%s`` has been disabled.", command.getName())));
         } else {
             builder.withPreset(new InformativeReply(InformativeReplyType.ERROR, String.format("Command ``%s`` could not be found.", name)));
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EnableCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/EnableCommand.java
similarity index 92%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EnableCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/EnableCommand.java
index 802d0bbf..8e64b32a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EnableCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/EnableCommand.java
@@ -1,6 +1,5 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dev;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.StringArgument;
@@ -44,7 +43,7 @@ public Permission getPermission() {
     
     @Override
     public void run(CommandEvent event) {
-        DisableCommandHandler handler = HelpBotInstance.getHandler().getDisabledHandler();
+        DisableCommandHandler handler = CommandHandler.getInstance().getDisabledHandler();
         PresetBuilder builder = new PresetBuilder();
         String name = event.getArgument("cmd");
         Command command = CommandHandler.getCommand(name);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EvalCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/EvalCommand.java
similarity index 62%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EvalCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/EvalCommand.java
index 133d6a0d..b7354f10 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EvalCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/EvalCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dev;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
@@ -13,10 +13,27 @@
 import javax.script.*;
 import java.awt.*;
 import java.io.*;
+import java.util.*;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class EvalCommand extends Command {
     
+    // Moderators can just give themselves bot dev role apparently...
+    private static final Set<Long> BOT_DEVELOPERS = Set.of(
+            511653192942092289L, // Reasonless
+            248855041803288576L, // Tomoli75
+            945012492030074900L  // Owen1212055
+    );
+    
+    private static final List<String> IMPORTS = List.of(
+            "net.dv8tion.jda.core",
+            "net.dv8tion.jda.core.managers",
+            "net.dv8tion.jda.core.entities",
+            "net.dv8tion.jda.core.entities.impl",
+            "net.dv8tion.jda.core.utils");
+    
     @Override
     public String getName() {
         return "eval";
@@ -50,29 +67,42 @@ public void run(CommandEvent event) {
         String code = event.getArgument("code");
         
         // Red is a bad boy, sometimes he decides he wants to open 500 tabs on my computer! This is here to stop Red, nothing else.
-        if (HelpBotInstance.getConfig().isDevBot()) {
+        if (HelpBotInstance.getConfig().isDevBot() && event.getAuthor().getIdLong() != 246778942323818506L) {
+            EmbedBuilder builder = new EmbedBuilder();
+            builder.setTitle("No.");
+            builder.setColor(Color.red);
+
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
+            return;
+        }
+        
+        boolean hasManual = BOT_DEVELOPERS.contains(event.getMember().getIdLong());
+        boolean hasRole = Permission.DEVELOPER.hasPermission(event.getMember());
+        if (!hasManual && !hasRole) {
             EmbedBuilder builder = new EmbedBuilder();
             builder.setTitle("No.");
             builder.setColor(Color.red);
             
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             return;
         }
         
-        ScriptEngine engine = new ScriptEngineManager().getEngineByName("js");
+        
+        ScriptEngine engine = new ScriptEngineManager().getEngineByName("groovy");
         engine.put("jda", event.getJDA());
         engine.put("event", event);
         
-        code = code.replaceAll("([^(]+?)\\s*->", "function($1)");
         EmbedBuilder builder = new EmbedBuilder();
         builder.addField("Code", String.format("```js\n%s```", code), true);
         
+        code = IMPORTS.stream().map(s -> "import " + s + ".*;").collect(Collectors.joining(" ")) + " " + code;
+        
         try {
             Object object = engine.eval(code); // Returns an object of the eval
             
             builder.setTitle("Eval Result");
             builder.addField("Object Returned:", String.format("```js\n%s```", EmbedUtil.fieldSafe(object)), false);
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             
         } catch (Throwable e) {
             StringWriter sw = new StringWriter();
@@ -80,9 +110,8 @@ public void run(CommandEvent event) {
             String sStackTrace = sw.toString();
             
             builder.setTitle("Eval failed!");
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             event.getChannel().sendMessage(String.format("```%s```", sStackTrace.length() >= 1500 ? sStackTrace.substring(0, 1500) : sStackTrace)).queue();
-            
         }
         
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/FetchDataCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/FetchDataCommand.java
new file mode 100644
index 00000000..779c3bb6
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/FetchDataCommand.java
@@ -0,0 +1,216 @@
+package com.diamondfire.helpbot.bot.command.impl.other.dev;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.MultiArgumentContainer;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.StringArgument;
+import com.diamondfire.helpbot.bot.command.help.CommandCategory;
+import com.diamondfire.helpbot.bot.command.help.HelpContext;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.df.codeinfo.codedatabase.changelog.CodeDifferenceHandler;
+import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.CodeDatabase;
+import com.diamondfire.helpbot.sys.externalfile.ExternalFileUtil;
+import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.utils.FileUpload;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+
+public class FetchDataCommand extends Command {
+    
+    private static final String USERNAME = HelpBotInstance.getConfig().getMcEmail();
+    private static final String PASSWORD = HelpBotInstance.getConfig().getMcPassword();
+    
+    @Override
+    public String getName() {
+        return "fetch";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Fetches data from node beta, then saves it as the current db.")
+                .category(CommandCategory.OTHER);
+    }
+    
+    @Override
+    public ArgumentSet compileArguments() {
+        return new ArgumentSet()
+                .addArgument("flag",
+                        new MultiArgumentContainer<>(
+                                new StringArgument()
+                        ).optional(null));
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.BOT_DEVELOPER;
+    }
+    
+    // TODO: flag code
+    @Override
+    public void run(CommandEvent event) {
+        List<String> flags = event.getArgument("flag");
+        if (flags == null) {
+            setup(event.getChannel().asGuildMessageChannel());
+        } else {
+            boolean includeColors = false;
+            boolean updateDb = true;
+            for (String flag : flags) {
+                if (flag.equals("-c")) {
+                    includeColors = true;
+                } else if (flag.equals("-d")) {
+                    updateDb = false;
+                }
+            }
+            setup(event.getChannel().asGuildMessageChannel(), includeColors, updateDb);
+        }
+    }
+    
+    public void setup(GuildMessageChannel channel) {
+        setup(channel, false, true);
+    }
+    
+    public void setup(GuildMessageChannel channel, boolean includeColors, boolean updateDb) {
+        EmbedBuilder builder = new EmbedBuilder();
+        
+        builder.setTitle("Fetching Code Database...");
+        builder.setDescription("Please wait a moment!");
+        
+        Message sentMessage = channel.sendMessageEmbeds(builder.build()).complete();
+        fetchData(sentMessage, includeColors).thenAccept((queue) -> {
+            status(sentMessage, String.format("Data has been received, parsing %s lines...", queue.size()));
+            
+            File file = null;
+            try {
+                file = updateDb ? ExternalFiles.DB : ExternalFileUtil.generateFile("temp_db.txt");
+                if (updateDb) {
+                    CodeDifferenceHandler.setComparer(file);
+                }
+                
+                if (file.exists()) {
+                    file.delete();
+                }
+                file.createNewFile();
+                
+                try (BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file.getPath(), true))) {
+                    for (String s : queue) {
+                        bufferedWriter.append(s);
+                    }
+                    
+                }
+                
+                
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if (updateDb) {
+                status(sentMessage, "Restarting and comparing code database...");
+                CodeDatabase.initialize();
+                CodeDifferenceHandler.refresh();
+                status(sentMessage, "Finished!");
+            } else {
+                status(sentMessage, "Finished!");
+                sentMessage.getChannel().sendFiles(FileUpload.fromData(file)).queue();
+            }
+        }).exceptionally((exception) -> {
+            error(sentMessage, exception);
+            
+            return null;
+        });
+    }
+    
+    private CompletableFuture<List<String>> fetchData(Message message, boolean includeColors) {
+        CompletableFuture<List<String>> completableFuture = new CompletableFuture<>();
+
+//        System.out.println("Logging in...");
+//
+//
+//
+//        TcpClientSession client = new TcpClientSession("beta.mcdiamondfire.com", 25565, new MinecraftProtocol(MinecraftCodec.CODEC, auth.getSelectedProfile(), auth.getAccessToken()));
+//
+//        status(message, "Connecting to DiamondFire...");
+//
+//        client.connect();
+//
+//        client.addListener(new SessionAdapter() {
+//
+//            boolean ready = false;
+//            List<String> queue = new ArrayList<>();
+//
+//            @Override
+//            public void packetReceived(Session session, Packet packet) {
+//                if (packet instanceof ClientboundLoginPacket) {
+//                    status(message, "Joined server!");
+//                    try {
+//                        Thread.sleep(2000);
+//                    } catch (InterruptedException e) {
+//                        e.printStackTrace();
+//                    }
+//                    session.send(new ServerboundChatCommandPacket("/chat none", System.currentTimeMillis(), System.currentTimeMillis(), List.of(), 0, new BitSet()));
+//                    session.send(new ServerboundChatCommandPacket(includeColors ? "/dumpactioninfo -c" : "/dumpactioninfo", System.currentTimeMillis(), System.currentTimeMillis(), List.of(), 0, new BitSet()));
+//                }
+//
+//                if (packet instanceof ClientboundSystemChatPacket chatPacket) {
+//                    String text = PlainComponentSerializer.INSTANCE.serialize(chatPacket.getContent());
+//
+//                    if (chatPacket.isOverlay()) return;
+//
+//                    if (text.contains("Unknown command!")) {
+//                        completableFuture.completeExceptionally(new IllegalStateException("Command not found!"));
+//                    }
+//
+//                    if (text.startsWith("{")) {
+//                        status(message, "Receiving data...");
+//                        ready = true;
+//                    } else if (text.startsWith("}")) {
+//                        client.disconnect("HelpBot data collection has concluded. ");
+//
+//                        if (queue.isEmpty()) {
+//                            completableFuture.completeExceptionally(new IllegalStateException("Failed to retrieve data"));
+//                            return;
+//                        }
+//
+//                        queue.add("}");
+//                        completableFuture.complete(queue);
+//                        return;
+//                    }
+//
+//                    if (ready) {
+//                        queue.add(new String(text.getBytes(StandardCharsets.UTF_8)));
+//                    }
+//
+//                }
+//            }
+//
+//        });
+
+        return completableFuture;
+    }
+    
+    private void error(Message message, Throwable e) {
+        EmbedBuilder builder = new EmbedBuilder();
+        builder.setTitle("Error occurred!");
+        builder.setDescription(e.getMessage());
+        message.editMessageEmbeds(builder.build()).queue();
+        e.printStackTrace();
+    }
+    
+    private void status(Message message, String status) {
+        EmbedBuilder builder = new EmbedBuilder();
+        builder.setTitle("Status");
+        builder.setDescription(status);
+        message.editMessageEmbeds(builder.build()).queue();
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/QueryCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/QueryCommand.java
similarity index 96%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/QueryCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/QueryCommand.java
index d0b8febd..0e85f3c6 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/QueryCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/QueryCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dev;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.MessageArgument;
@@ -82,7 +82,7 @@ public void run(CommandEvent event) {
             e.printStackTrace(new PrintWriter(sw));
             String sStackTrace = sw.toString();
             builder.setTitle("Query failed! " + e.getClass().getName());
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             event.getChannel().sendMessage(String.format("```%s```", sStackTrace.length() >= 1500 ? sStackTrace.substring(0, 1500) : sStackTrace)).queue();
         }
         
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/RestartCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/RestartCommand.java
similarity index 90%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/RestartCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/RestartCommand.java
index 008d3e2f..4ea13503 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/RestartCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/RestartCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dev;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -43,7 +43,7 @@ public void run(CommandEvent event) {
         builder.setTitle("Restarting!");
         builder.setDescription("This may take a moment");
         
-        event.getChannel().sendMessage(builder.build()).queue((msg) -> {
+        event.getChannel().sendMessageEmbeds(builder.build()).queue((msg) -> {
             RestartHandler.logRestart(msg);
             System.exit(0);
         });
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ActionDumpCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/ActionDumpCommand.java
similarity index 85%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ActionDumpCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/ActionDumpCommand.java
index f15f4d00..c617c6f6 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ActionDumpCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/ActionDumpCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dumps;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -6,6 +6,7 @@
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 public class ActionDumpCommand extends Command {
     
@@ -33,7 +34,7 @@ public Permission getPermission() {
     
     @Override
     public void run(CommandEvent event) {
-        event.getChannel().sendFile(ExternalFiles.DB).queue();
+        event.getChannel().sendFiles(FileUpload.fromData(ExternalFiles.DB)).queue();
     }
     
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ImageDumpCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/ImageDumpCommand.java
similarity index 87%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ImageDumpCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/ImageDumpCommand.java
index 2e8281d4..045fa9a2 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ImageDumpCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/ImageDumpCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dumps;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -9,6 +9,7 @@
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
 import com.diamondfire.helpbot.util.IOUtil;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.io.*;
 
@@ -44,13 +45,13 @@ public void run(CommandEvent event) {
         event.getReplyHandler().replyA(builder).queue((msg) -> {
             try {
                 File zip = IOUtil.zipFile(images.toPath(), "images.zip");
-                event.getChannel().sendFile(zip).queue((fileMsg) -> {
+                event.getChannel().sendFiles(FileUpload.fromData(zip)).queue((fileMsg) -> {
                     msg.delete().queue();
                 });
             } catch (IOException e) {
                 PresetBuilder builderError = new PresetBuilder();
                 builder.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Failed to send zip file."));
-                msg.editMessage(builderError.getEmbed().build()).queue();
+                msg.editMessageEmbeds(builderError.getEmbed().build()).queue();
             }
         });
         
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/SoundListCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/SoundListCommand.java
similarity index 86%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/SoundListCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/SoundListCommand.java
index 0099754c..c740c18f 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/SoundListCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/SoundListCommand.java
@@ -1,6 +1,7 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.dumps;
 
 import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.other.util.AbstractFileListCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.CodeDatabase;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/CowsayCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/CowsayCommand.java
new file mode 100644
index 00000000..d9d069c4
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/CowsayCommand.java
@@ -0,0 +1,71 @@
+package com.diamondfire.helpbot.bot.command.impl.other.fun;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.EndlessStringArgument;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.util.StringUtil;
+import net.dv8tion.jda.api.EmbedBuilder;
+
+public class CowsayCommand extends Command {
+    
+    @Override
+    public String getName() {
+        return "cowsay";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext().description("generates ASCII art pictures of a cow with a message")
+                .category(CommandCategory.OTHER)
+                .addArgument(new HelpContextArgument()
+                        .name("message"));
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet().addArgument("message", new EndlessStringArgument());
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        String message = event.getArgument("message");
+        
+        char bubbleTop = '_';
+        char bubbleBot = '-';
+        
+        StringBuilder bubbleBuilder = new StringBuilder();
+        
+        // Generates the top closing part of the speech bubble
+        bubbleBuilder.append(bubbleTop);
+        bubbleBuilder.append(String.valueOf(bubbleTop).repeat(Math.max(0, message.length() + 1)));
+        bubbleBuilder.append(bubbleTop + "\n");
+        
+        bubbleBuilder.append("< " + message + " >\n"); // Generates the middle and message part of the speech bubble
+        
+        bubbleBuilder.append(bubbleBot);
+        bubbleBuilder.append(String.valueOf(bubbleBot).repeat(Math.max(0, message.length() + 1)));
+        bubbleBuilder.append(bubbleBot + "\n");
+        
+        StringBuilder cowBuilder = new StringBuilder();
+        cowBuilder.append("        \\   ^__^\n");
+        cowBuilder.append("         \\  (oo)\\_______\n");
+        cowBuilder.append("            (__)\\       )\\/\\\n");
+        cowBuilder.append("                ||----w |\n");
+        cowBuilder.append("                ||     ||\n");
+    
+    
+        EmbedBuilder builder = new EmbedBuilder()
+                .setTitle("The cow says")
+                .appendDescription("```\n" + StringUtil.display(bubbleBuilder.toString() + cowBuilder.toString()) + "\n```");
+        
+        event.getMessage().getChannel().sendMessageEmbeds(builder.build()).queue();
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EightBallCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/EightBallCommand.java
similarity index 92%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EightBallCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/EightBallCommand.java
index b45242ba..0a6815de 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/EightBallCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/EightBallCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.fun;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.*;
@@ -38,7 +38,7 @@ public HelpContext getHelpContext() {
     public ArgumentSet compileArguments() {
         return new ArgumentSet()
                 .addArgument("question",
-                        new SingleArgumentContainer<>(new MessageArgument()).optional("Is vatten super duper cool?"));
+                        new SingleArgumentContainer<>(new MessageArgument()));
     }
     
     @Override
@@ -72,7 +72,7 @@ public void run(CommandEvent event) {
         builder.setTitle(":8ball: | " + event.getArgument("question"));
         builder.setDescription(responses[rdm.nextInt(responses.length)]);
         
-        event.getChannel().sendMessage(builder.build()).queue();
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
     }
     
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/GarfieldCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/GarfieldCommand.java
similarity index 87%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/GarfieldCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/GarfieldCommand.java
index 441c3f68..aefc3552 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/GarfieldCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/GarfieldCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.fun;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -41,9 +41,9 @@ public Permission getPermission() {
     public void run(CommandEvent event) {
         EmbedBuilder builder = new EmbedBuilder();
         try {
-            URL url = new URL("https://labscore.vercel.app/v2/garfield");
+            URL url = new URL("https://garfield.justsomederpyst.repl.co/random");
             try (BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()))) {
-                String link = JsonParser.parseString(in.readLine()).getAsJsonObject().get("link").getAsString();
+                String link = JsonParser.parseString(in.readLine()).getAsJsonObject().get("direct_url").getAsString();
                 
                 if (link == null) {
                     throw new IOException();
@@ -57,7 +57,7 @@ public void run(CommandEvent event) {
             builder.setTitle(":rotating_light: API BROKE :rotating_light:");
             builder.setDescription("DM: <@223518178100248576>\nPING: <@223518178100248576>");
         }
-        event.getChannel().sendMessage(builder.build()).queue();
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
     }
     
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/IdeaCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/IdeaCommand.java
new file mode 100644
index 00000000..9cee6ba2
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/IdeaCommand.java
@@ -0,0 +1,379 @@
+package com.diamondfire.helpbot.bot.command.impl.other.fun;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+
+import java.util.Random;
+import java.util.ArrayList;
+
+public class IdeaCommand extends Command {
+    
+    private static final int[] VALUES = new int[]{1,2,3,4};
+    private static final int[] WEIGHTS = new int[]{10,5,2,1};
+    
+    private static final String[] GAME_TYPES = new String[]{ // For the main genre of the game. 'A(n) <x>, <x> game.'
+            "2D",
+            "Adventure",
+            "Anarchy",
+            "Arcade",
+            "Arena",
+            "Battle-Royale",
+            "Board",
+            "Boss-Fight",
+            "Building",
+            "Bullet-Hell",
+            "Capture-the-Monument",
+            "Card",
+            "City",
+            "Clicker",
+            "Coding",
+            "Creative",
+            "Deck-Building",
+            "Dungeon",
+            "Elimination",
+            "Escape",
+            "Exploration",
+            "Factions",
+            "Farming",
+            "Fighting",
+            "GUI-Based",
+            "Grinder",
+            "Hack-and-Slash",
+            "Heist",
+            "Horror",
+            "Infection",
+            "King-of-the-Hill",
+            "Magic",
+            "Metroidvania",
+            "Military",
+            "Minigame",
+            "Mining",
+            "Parkour",
+            "Parody",
+            "Party",
+            "Platformer",
+            "Point-and-Click",
+            "Puzzle",
+            "PvE",
+            "PvP",
+            "RPG",
+            "Racing",
+            "Recreation",//e.g.Terraria or Quiplash or Pictionary or Doom or etc...
+            "Rhythm",
+            "Roguelike",
+            "Roleplay",
+            "Round-Based",
+            "Sandbox",
+            "Shooter",
+            "Simulator",
+            "Sky-Based",
+            "Stealth",
+            "Story-Driven",
+            "Strategy",
+            "Survival",
+            "Technical/Demo",
+            "Text-Based",
+            "Top-Down",
+            "Tower-Defense",
+            "Trivia/Quiz",
+            "Turn-Based",
+            "Versus",
+            "Visual-Novel"
+    };
+    
+    private static final String[] ADJECTIVES = new String[] {
+            "a Joke",
+            "Action-Packed",
+            "Casual",
+            "Challenging",
+            "Cheerful",
+            "Colorful",
+            "Competitive",
+            "Complex",
+            "Creepy",
+            "Dynamic",  // Make what you will of this
+            "Easy",
+            "Enjoyable",
+            "Fast-Paced",
+            "Finite",
+            "Friendly",
+            "Frustrating",
+            "Funny",
+            "Grindy",
+            "In-Depth",
+            "Infinite",
+            "Long",
+            "Meta",
+            "Multiplayer",
+            "Musical",
+            "Mysterious",
+            "Passive",
+            "Quality over Quantity",
+            "Quantity over Quality",
+            "Repetitive",
+            "Retro",
+            "Serious",
+            "Short",
+            "Simple",
+            "Singleplayer",
+            "Story Driven",
+            "Thought Provoking",
+            "Unique",
+            "Unreasonably Polished",
+            "Weird"
+    };
+    
+    private static final String[] GAMEPLAY_ELEMENTS = new String[] {
+            "a Large Scale",
+            "a Skill Tree",
+            "a Small Scale",
+            "an aggressive amount of bees",
+            "Abilities", "Abilities", // More weight
+            "Achievements",
+            "Aesthetics",
+            "Air",
+            "Animals",
+            "Arson",
+            "Artificial Intelligence",
+            "Blindness",
+            "Blocks",
+            "Building",
+            "Cars",
+            "Chance",
+            "Chat",
+            "Clicking",
+            "Close Combat",
+            "Co-op",
+            "Codes",
+            "Color",
+            "Combat",
+            "Combinations",
+            "Competition",
+            "Cosmetics",
+            "Crafting",
+            "Creepers",
+            "Currency",
+            "Customizability",
+            "Daily Content",
+            "Darkness",
+            "Day and Night",
+            "Death",
+            "Delivery",
+            "Depth",
+            "Dialogue",
+            "Dice",
+            "Dimensions",
+            "Discovery",
+            "Duels",
+            "Eldritch Creatures",
+            "Enemies", "Enemies",
+            "Entities",
+            "Equipment",
+            "Factions",
+            "Fire",
+            "Flying",
+            "Food",
+            "Free for All",
+            "Generation",
+            "Gravity",
+            "Guns",
+            "Health",
+            "Hell",
+            "Hidden Areas",
+            "Hunger",
+            "Instructions",
+            "Knowledge",
+            "Lava",
+            "Light",
+            "Lootboxes",
+            "Lore",
+            "Magic",
+            "Mazes",
+            "Memes",
+            "Minigames",
+            "Missiles",
+            "Mobility",
+            "Mobs", "Mobs",
+            "Money",
+            "Monsters",
+            "Movement",
+            "Music",
+            "NPCs",
+            "Numbers",
+            "Permanent Progress", "Permanent Progress",
+            "Perspective",
+            "Plants",
+            "Power",
+            "Progression",
+            "Questionable Activities",
+            "Randomly Generated Content",
+            "Randomness",
+            "Riddles",
+            "Robots",
+            "SANS?!?!?!", //SANS?!?!?!
+            "Secrets",
+            "Shops",
+            "Skills",
+            "Snow/Ice",
+            "Sound",
+            "Space",
+            "Spells",
+            "Stats",
+            "Stealth",
+            "Strategy",
+            "Surviving",
+            "Team Fights",
+            "Teams",
+            "Technology",
+            "Teleportation",
+            "Terrain",
+            "the End",
+            "the Sky",
+            "Thinking",
+            "Time",
+            "Time Limits",
+            "Unlocks",
+            "Upgrades",
+            "Variation",
+            "Volcanoes",
+            "Waiting",
+            "Water"
+    };
+    
+    private static final String[] THEMES = new String[] {
+            "Ancient",
+            "Automatic",
+            "Broken",
+            "Cavernous",
+            "City",
+            "Construct",
+            "Dark",
+            "Decay",
+            "Deceptive",
+            "Deleted",
+            "Depths",
+            "Desert",
+            "Dimensional",
+            "Fantasy",
+            "Freedom",
+            "Futuristic",
+            "Gigantic",
+            "Glitchy",
+            "Growth",
+            "Isolated",
+            "Laboratory",
+            "Linked",
+            "Lush",
+            "Magical",
+            "Mirrored",
+            "Modern",
+            "Monochromatic",
+            "Mythical",
+            "Night",
+            "Plain",
+            "Power",
+            "Remote",
+            "Ruined",
+            "Science",
+            "Shattered",
+            "Simplistic",
+            "Snowy",
+            "Space",
+            "Spy",
+            "Surreal",
+            "Swarm",
+            "Torment",
+            "Underground",
+            "Underwater",
+            "Vanish",
+            "Zombie"
+    };
+    
+    private static final Random RNG = new Random();
+    
+    @Override
+    public String getName() {
+        return "idea";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Generates a genius game idea.")
+                .category(CommandCategory.OTHER);
+    }
+    
+    @Override
+    public ArgumentSet compileArguments() {
+        return new ArgumentSet();
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    private int weightedRandom(int[] values, int[] weights){
+        int totalWeight = 0;
+        for (int weight : weights){
+            totalWeight += weight;
+        }
+        int point = RNG.nextInt(totalWeight);
+        for (int i = 0; i < weights.length; i++){
+            if (point < weights[i]){
+                return values[i];
+            }
+            point -= weights[i];
+        }
+        throw new IllegalStateException("Weighted Random improperly formatted.");
+    }
+    
+    //private String getRngStrings(String[] sourceStrings, int numToFind){ return getRngStrings(sourceStrings, numToFind, " "); }
+    private String getRngStrings(String[] sourceStrings, int numToFind, String joiner){
+        ArrayList<String> strings = new ArrayList<>();
+        String toAdd;
+        while (numToFind > 0){
+            toAdd = sourceStrings[RNG.nextInt(sourceStrings.length)];
+            if (!strings.contains(toAdd)){
+                strings.add(toAdd);
+                numToFind--;
+            }
+        }
+        return String.join(joiner, strings);
+    }
+    
+ 
+    @Override
+    public void run(CommandEvent event) {
+
+        int numTypes = weightedRandom(VALUES, WEIGHTS);
+        int numGameplay = weightedRandom(VALUES, WEIGHTS);
+        
+        String adj = RNG.nextInt(3) == 0 ? ADJECTIVES[RNG.nextInt(ADJECTIVES.length)] : null;
+        String theme = RNG.nextInt(3) == 0 ? THEMES[RNG.nextInt(THEMES.length)] : null;
+        String typeString = "A(n) " + getRngStrings(GAME_TYPES, numTypes, " ") + " game.";
+        String gameplayString = "It should include " + getRngStrings(GAMEPLAY_ELEMENTS, numGameplay, ", ") +
+                " and an emphasis on " + GAMEPLAY_ELEMENTS[RNG.nextInt(GAMEPLAY_ELEMENTS.length)] + ".";
+        
+        String finalString = typeString;
+        if (adj != null){
+            finalString += "\nThe game should be " + adj + ".";
+        }
+        finalString += "\n" + gameplayString;
+        if (theme != null){
+            finalString += "\nThe game should follow a(n) " + theme + " theme.";
+        }
+        
+        EmbedBuilder builder = new EmbedBuilder();
+    
+        builder.setTitle("Idea \uD83D\uDCA1");
+        builder.setDescription(finalString);
+        //builder.setColor(new Color(0, 214, 255, 145));
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
+        
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/NbsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/NbsCommand.java
new file mode 100644
index 00000000..d419e98f
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/NbsCommand.java
@@ -0,0 +1,91 @@
+package com.diamondfire.helpbot.bot.command.impl.other.fun;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.util.nbs.*;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.utils.FileUpload;
+
+import java.awt.*;
+import java.io.*;
+
+public class NbsCommand extends Command {
+    
+    private static final String NBS_IMAGE = "https://static.wikia.nocookie.net/minecraft/images/9/9b/Note_Block.png/revision/latest?cb=20190921170620";
+    
+    @Override
+    public String getName() {
+        return "nbs";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Generates a Recode song function.")
+                .category(CommandCategory.OTHER);
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet();
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        GuildMessageChannel channel = event.getChannel().asGuildMessageChannel();
+        PresetBuilder attachNbsMsg = new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR,"You need to attach an nbs file!"));
+        PresetBuilder errorMsg = new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR,"Something went wrong while generating!"));
+        
+        if (event.getMessage().getAttachments().isEmpty()) {
+            event.reply(attachNbsMsg);
+            return;
+        }
+        
+        Message.Attachment attachment = event.getMessage().getAttachments().get(0);
+        if (!attachment.getFileExtension().equals("nbs")) {
+            event.reply(attachNbsMsg);
+            return;
+        }
+        
+        File file = new File("input.nbs");
+        
+        
+        attachment.getProxy().downloadToFile(file).thenAccept(downloadedFile -> {
+            try {
+                byte[] b64 = new NBSToTemplate(NBSDecoder.parse(file)).convert();
+                File templateOutputfile = File.createTempFile("nbs_output", ".txt");
+                BufferedWriter writer = new BufferedWriter(new FileWriter(templateOutputfile));
+                writer.write(String.format("/give @p minecraft:ender_chest[minecraft:item_name=[{text:\"» \",color:gold},{text:\"Code Template\",color:yellow,bold:1}],custom_data={PublicBukkitValues:{\"hypercube:codetemplatedata\":'{\"name\":\"&6» &e&lCode Template\",\"version\":1,\"code\":\"%s\",\"author\":\"Help Bot\"}'}}]", new String(b64)));
+                
+                writer.close();
+                    
+                EmbedBuilder embed = new EmbedBuilder()
+                        .setColor(new Color(70,199,82))
+                        .setTitle("Template Generated!")
+                        .setThumbnail(NBS_IMAGE)
+                        .addField("Information","You can copy the command above and give it to yourself in singleplayer. Use toolbars to transfer it to Diamondfire. You will need a [Music Player](https://dfonline.dev/edit/?template=nbs) function to play this song!", false);
+                
+                
+                channel.sendFiles(FileUpload.fromData(templateOutputfile)).setEmbeds(embed.build()).queue();
+                file.deleteOnExit();
+            } catch (OutdatedNBSException | IOException e) {
+                e.printStackTrace();
+                event.reply(errorMsg);
+            }
+        });
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/OcrCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/OcrCommand.java
new file mode 100644
index 00000000..1f9f5b7b
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/OcrCommand.java
@@ -0,0 +1,108 @@
+package com.diamondfire.helpbot.bot.command.impl.other.fun;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.StringArgument;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.util.*;
+import com.google.gson.JsonParser;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+
+import java.io.*;
+import java.net.*;
+import java.util.List;
+
+public class OcrCommand extends Command {
+    
+    private static final String ENDPOINT = "https://labscore.vercel.app/v3/google/vision/ocr?url=";
+    
+    @Override
+    public String getName() {
+        return "ocr";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Recognizes text based on an image.")
+                .category(CommandCategory.OTHER)
+                .addArgument(
+                        new HelpContextArgument()
+                        .name("File Link OR Attachment")
+                        .optional()
+                );
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet()
+                .addArgument("url",
+                        new SingleArgumentContainer<>(new StringArgument())
+                                .optional(null)
+                );
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        String imgUrl = event.getArgument("url");
+        if (imgUrl == null) {
+           List<Message.Attachment> attachments = event.getMessage().getAttachments();
+           if (attachments.isEmpty()) {
+               event.reply(
+                       new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR, "Please provide an attachment or url!"))
+               );
+               return;
+           } else {
+               imgUrl = attachments.get(0).getProxyUrl();
+           }
+        }
+    
+        HttpURLConnection connection = null;
+        try {
+            URL url = new URL(ENDPOINT + imgUrl);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.addRequestProperty("x-labscore-auth", HelpBotInstance.getConfig().getlabsCoreToken());
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                String text = JsonParser.parseString(in.readLine()).getAsJsonObject().get("text").getAsString();
+                if (text.isEmpty()) {
+                    text = "No text found";
+                }
+                
+                EmbedBuilder builder = new EmbedBuilder()
+                        .setTitle("OCR Result")
+                        .setThumbnail(imgUrl)
+                        .setDescription(StringUtil.trim(text, 2048));
+                EmbedUtil.labsCoreBranding(builder);
+    
+                event.getReplyHandler().reply(builder);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            try {
+                if (connection.getResponseCode() == 400) {
+                    event.reply(
+                            new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR, "The attachment/url you provided could not be read. Make sure it's an image."))
+                    );
+                    return;
+                }
+            } catch (Exception ignored) {
+            }
+    
+            event.reply(
+                    new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR, "The server errored while processing your request. Please try again later."))
+            );
+        }
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/SamQuotesCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/SamQuotesCommand.java
new file mode 100644
index 00000000..8fa27032
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/SamQuotesCommand.java
@@ -0,0 +1,65 @@
+package com.diamondfire.helpbot.bot.command.impl.other.fun;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.DefinedObjectArgument;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.utils.FileUpload;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.geom.Ellipse2D;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.*;
+
+import static com.diamondfire.helpbot.util.textgen.CacheData.cacheData;
+import static com.diamondfire.helpbot.util.textgen.MarkovManipulation.getNextWord;
+
+public class SamQuotesCommand extends Command {
+    
+    private static final Random random = new Random();
+    
+    @Override
+    public String getName() {
+        return "samquote";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Gets a quote from Sam the Man.")
+                .category(CommandCategory.OTHER);
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        String[] strings = ExternalFiles.SAM_DIR.list();
+        
+        File file = new File(ExternalFiles.SAM_DIR, strings[random.nextInt(strings.length)]);
+        EmbedBuilder builder = new EmbedBuilder();
+        builder.setTitle("Sam Quote");
+        builder.setImage("attachment://quote.png");
+        builder.setColor(new Color(87, 177, 71));
+    
+        event.getChannel().sendMessageEmbeds(builder.build()).addFiles(FileUpload.fromData(file).setName("quote.png")).queue();
+    }
+    
+    @Override
+    public ArgumentSet compileArguments() {
+        return new ArgumentSet();
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/HelpCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/HelpCommand.java
similarity index 91%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/HelpCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/HelpCommand.java
index c280cfd7..33c261e0 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/HelpCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/HelpCommand.java
@@ -1,6 +1,6 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.info;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.DefinedObjectArgument;
@@ -8,7 +8,7 @@
 import com.diamondfire.helpbot.bot.command.impl.Command;
 import com.diamondfire.helpbot.bot.command.permissions.*;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.sys.reactions.multiselector.MultiSelectorBuilder;
+import com.diamondfire.helpbot.sys.multiselector.MultiSelectorBuilder;
 import com.diamondfire.helpbot.util.FormatUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
 
@@ -42,7 +42,7 @@ public boolean cacheArgumentSet() {
     @Override
     public ArgumentSet compileArguments() {
         return new ArgumentSet().addArgument("help",
-                new SingleArgumentContainer<>(new DefinedObjectArgument<>(HelpBotInstance.getHandler().getCommands().values().stream()
+                new SingleArgumentContainer<>(new DefinedObjectArgument<>(CommandHandler.getInstance().getCommands().values().stream()
                         .map(Command::getName)
                         .toArray(String[]::new))).optional(null));
     }
@@ -75,7 +75,7 @@ public void run(CommandEvent event) {
             categories.put(CommandCategory.CODE_BLOCK, new EmbedBuilder());
             categories.put(CommandCategory.OTHER, new EmbedBuilder());
             
-            List<Command> commandList = new ArrayList<>(HelpBotInstance.getHandler().getCommands().values());
+            List<Command> commandList = new ArrayList<>(CommandHandler.getInstance().getCommands().values());
             commandList.sort(Comparator.comparing(Command::getName));
             for (Command command : commandList) {
                 HelpContext context = command.getHelpContext();
@@ -97,7 +97,7 @@ public void run(CommandEvent event) {
             }
             selector.build().send(event.getJDA());
         } else {
-            Command command = HelpBotInstance.getHandler().getCommands().get(helpInfo);
+            Command command = CommandHandler.getInstance().getCommands().get(helpInfo);
             HelpContext context = command.getHelpContext();
             EmbedBuilder builder = new EmbedBuilder();
             builder.setTitle("Command Information");
@@ -108,7 +108,7 @@ public void run(CommandEvent event) {
             builder.addField("Category", context.getCommandCategory().toString(), true);
             builder.addField("Role Required", String.format("<@&%s>", command.getPermission().getRole()), true);
             
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
         }
         
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/InfoCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/InfoCommand.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/InfoCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/InfoCommand.java
index 2c41ec27..672fecdf 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/InfoCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/InfoCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.info;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PermUnlocksCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/PermUnlocksCommand.java
similarity index 92%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PermUnlocksCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/PermUnlocksCommand.java
index 7e435dd6..cf0c418f 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PermUnlocksCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/PermUnlocksCommand.java
@@ -1,6 +1,6 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.info;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.DefinedObjectArgument;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -53,7 +53,7 @@ public void run(CommandEvent event) {
                 );
         
         List<String> commands = new ArrayList<>();
-        List<Command> commandList = new ArrayList<>(HelpBotInstance.getHandler().getCommands().values());
+        List<Command> commandList = new ArrayList<>(CommandHandler.getInstance().getCommands().values());
         commandList.sort(Comparator.comparingInt((command) -> command.getPermission().ordinal()));
         
         for (Command command : commandList) {
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PolicyCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/PolicyCommand.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PolicyCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/PolicyCommand.java
index bffca2c7..6f24423a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PolicyCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/PolicyCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.info;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/RulesCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/RulesCommand.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/RulesCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/RulesCommand.java
index 9f9f621d..c9743aaa 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/RulesCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/RulesCommand.java
@@ -1,11 +1,11 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.info;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.Command;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.sys.reactions.multiselector.MultiSelectorBuilder;
+import com.diamondfire.helpbot.sys.multiselector.MultiSelectorBuilder;
 import net.dv8tion.jda.api.EmbedBuilder;
 
 public class RulesCommand extends Command {
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ChannelMuteCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/ChannelMuteCommand.java
similarity index 68%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ChannelMuteCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/ChannelMuteCommand.java
index b3866147..2bc6f32e 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/ChannelMuteCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/ChannelMuteCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.mod;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
@@ -10,9 +10,12 @@
 import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
 import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
+import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.tasks.impl.MuteExpireTask;
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 
 import java.time.*;
 import java.util.Date;
@@ -27,7 +30,7 @@ public String getName() {
     @Override
     public HelpContext getHelpContext() {
         return new HelpContext()
-                .description("Mutes a player from posing in a specific channel for one week (7 days)")
+                .description("Mutes a player from posting in a specific channel for a specified duration.")
                 .category(CommandCategory.OTHER)
                 .addArgument(new HelpContextArgument().name("user"))
                 .addArgument(new HelpContextArgument().name("channel"))
@@ -60,24 +63,34 @@ public void run(CommandEvent event) {
         }
         String reason = event.getArgument("reason");
         if (reason.length() == 0) {
-            reason = "No reason given";
+            reason = "No reason given.";
         }
         long timeLeft = duration.toInstant().minusSeconds(Instant.now().getEpochSecond()).toEpochMilli();
         Date finalDuration = duration;
         event.getGuild().retrieveMemberById(user).queue((msg) -> {
-                    //TODO Owen DBQuery
-                    
+                    event.getGuild().retrieveMemberById(user).queue((member) -> {
+                        new DatabaseQuery()
+                                .query(new BasicQuery("INSERT INTO owen.muted_members (member,muted_by,muted_at,muted_till,reason) VALUES (?,?,CURRENT_TIMESTAMP(),?,?)", (statement) -> {
+                                    statement.setLong(1, user);
+                                    statement.setLong(2, event.getAuthor().getIdLong());
+                                    statement.setTimestamp(3, DateUtil.toTimeStamp(finalDuration));
+                                    statement.setString(4, event.getArgument("reason"));
+                                    
+                                }))
+                                .compile();
+                    });
                     
                     builder.withPreset(
-                            new InformativeReply(InformativeReplyType.SUCCESS, "Muted!", String.format("User will be muted for ``%s``.", FormatUtil.formatMilliTime(timeLeft)))
+                            new InformativeReply(InformativeReplyType.SUCCESS, "Muted!",
+                                    String.format("User will be muted in <#%s> for `%s`.", channel, FormatUtil.formatMilliTime(timeLeft)))
                     );
                     Guild punishmentGuild = event.getGuild();
                     TextChannel textChannel = punishmentGuild.getTextChannelById(channel);
                     punishmentGuild.retrieveMemberById(user).queue((member) -> {
-                        textChannel.putPermissionOverride(member).deny(net.dv8tion.jda.api.Permission.MESSAGE_ADD_REACTION, net.dv8tion.jda.api.Permission.MESSAGE_WRITE).queue();
+                        textChannel.upsertPermissionOverride(member).deny(net.dv8tion.jda.api.Permission.MESSAGE_ADD_REACTION, net.dv8tion.jda.api.Permission.MESSAGE_SEND).queue();
                     });
                     
-                    HelpBotInstance.getScheduler().schedule(new MuteExpireTask(user, finalDuration, false));
+                    HelpBotInstance.getScheduler().schedule(new MuteExpireTask(user, finalDuration));
                     event.reply(builder);
                 }, (error) -> {
                     builder.withPreset(
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MuteCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/MuteCommand.java
similarity index 82%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MuteCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/MuteCommand.java
index 8f5a7483..daceacf3 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MuteCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/MuteCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.mod;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
@@ -14,8 +14,10 @@
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.tasks.impl.MuteExpireTask;
 import com.diamondfire.helpbot.util.*;
+import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.*;
 
+import java.awt.*;
 import java.time.Instant;
 import java.util.Date;
 
@@ -79,7 +81,7 @@ public void run(CommandEvent event) {
                     .compile();
             
             builder.withPreset(
-                    new InformativeReply(InformativeReplyType.SUCCESS, "Muted!", String.format("Player will be muted for ``%s``. They have been notified.", FormatUtil.formatMilliTime(timeLeft)))
+                    new InformativeReply(InformativeReplyType.SUCCESS, "Muted!", String.format("Player will be muted for `%s`. They have been notified.", FormatUtil.formatMilliTime(timeLeft)))
             );
             Guild guild = event.getGuild();
             Role role = guild.getRoleById(MuteCommand.ROLE_ID);
@@ -94,7 +96,7 @@ public void run(CommandEvent event) {
             guild.addRoleToMember(member, role).queue((unused) -> {
                 member.getUser()
                         .openPrivateChannel()
-                        .flatMap((e) -> e.sendMessage(String.format("You have been muted for %s for %s", FormatUtil.formatMilliTime(timeLeft), event.getArgument("reason"))))
+                        .flatMap((e) -> e.sendMessageEmbeds(getMuteEmbed(event.getArgument("reason"),timeLeft)))
                         .queue();
                 HelpBotInstance.getScheduler().schedule(new MuteExpireTask(user, duration));
             }, (error) -> {
@@ -114,4 +116,16 @@ public void run(CommandEvent event) {
         });
         
     }
+    
+    private MessageEmbed getMuteEmbed(String reason, long duration) {
+        EmbedBuilder muteEmbedBuilder = new EmbedBuilder()
+                .setTitle("You have been muted!")
+                .setDescription(
+                        "**Reason**: " + reason + "\n" +
+                        "**Duration**: " + FormatUtil.formatMilliTime(duration) + "\n" +
+                        "*If you feel as if this punishment is unfair you may appeal on the forums https://mcdiamondfire.com*"
+                )
+                .setColor(new Color(208, 97, 97));
+        return muteEmbedBuilder.build();
+    }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MutedCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/MutedCommand.java
similarity index 94%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MutedCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/MutedCommand.java
index 72a5be77..7112e4bc 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MutedCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/MutedCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.mod;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -66,7 +66,7 @@ public void run(CommandEvent event) {
                             names.add(name);
                         }
                         
-                        muted.add("<@" + name + ">\n" + String.format("For: ``%s``\nReason: %s (<@%s>)", FormatUtil.formatMilliTime(duration), reason, muted_by));
+                        muted.add("<@" + name + ">\n" + String.format("For: `%s`\nReason: %s (<@%s>)", FormatUtil.formatMilliTime(duration), reason, muted_by));
                     }
                     
                     EmbedUtil.addFields(builder.getEmbed(), muted, "", false);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/PurgeCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/PurgeCommand.java
new file mode 100644
index 00000000..cbdc99db
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/PurgeCommand.java
@@ -0,0 +1,114 @@
+package com.diamondfire.helpbot.bot.command.impl.other.mod;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.*;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.externalfile.ExternalFileUtil;
+import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.utils.FileUpload;
+
+import java.io.File;
+import java.nio.file.*;
+import java.time.format.DateTimeFormatter;
+
+public class PurgeCommand extends Command {
+    
+    @Override public String getName() { return "purge"; }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Removes the most recent messages sent in a channel. Maximum 100 messages.")
+                .category(CommandCategory.OTHER)
+                .addArgument(
+                        new HelpContextArgument()
+                                .name("count")
+                );
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet()
+                .addArgument("count",
+                        new IntegerArgument());
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.MODERATION;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        PresetBuilder builder = new PresetBuilder();
+    
+        int messagesToRemove = event.getArgument("count");
+        
+        if (messagesToRemove > 100 || messagesToRemove < 2) {
+            builder.withPreset(
+                    new InformativeReply(InformativeReplyType.ERROR, "Message count not within 2 to 100.")
+            );
+            event.reply(builder);
+        } else {
+            GuildMessageChannel channel = event.getChannel().asGuildMessageChannel();
+            channel.getHistory().retrievePast(messagesToRemove).queue((messages) -> {
+                // Adds the messages to the messageBuilder object
+                StringBuilder stringBuilder = new StringBuilder();
+                
+                // Iterates through the message history and appends the values to the MessageBuilder.
+                for (Message m : messages) {
+                    stringBuilder.insert(0,
+                                    String.format("[%s] (%s): %s",
+                                            m.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME),
+                                            m.getAuthor().getName(),
+                                            m.getContentRaw())
+                            );
+                    if (!m.getAttachments().isEmpty()) {
+                        for (Message.Attachment a : m.getAttachments()) {
+                            stringBuilder.insert(0,
+                                    String.format(" [ATTACHMENT: %s ]\n",
+                                            a.getProxyUrl())
+                            );
+                        }
+                    } else {
+                        stringBuilder.insert(0,
+                                "\n"
+                        );
+                    }
+                }
+    
+                stringBuilder.insert(0,
+                        String.format("%s purged %s messages in #%s",
+                                event.getAuthor().getAsTag(),
+                                messagesToRemove,
+                                event.getChannel().getName()));
+                
+                try {
+                    File file = ExternalFileUtil.generateFile("purge_log.txt");
+                    Files.writeString(file.toPath(), stringBuilder.toString(), StandardOpenOption.WRITE);
+    
+                    TextChannel evidenceLog = event.getJDA().getTextChannelById(
+                            HelpBotInstance.getConfig().getPurgeEvidenceChannel()
+                    );
+    
+                    assert evidenceLog != null;
+                    evidenceLog.sendFiles(FileUpload.fromData(file)).queue();
+                    
+                } catch (Exception e) {
+                    throw new IllegalStateException();
+                }
+                
+                // Removes the messages.
+                channel.deleteMessages(messages).queue();
+            });
+        }
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/UnmuteCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/UnmuteCommand.java
similarity index 85%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/UnmuteCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/UnmuteCommand.java
index 3f172237..d5bdb0f0 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/UnmuteCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/UnmuteCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.mod;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.*;
@@ -12,6 +12,7 @@
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 
 import java.sql.ResultSet;
 
@@ -71,16 +72,8 @@ public void run(CommandEvent event) {
                             
                         } else {
                             Guild guild = event.getGuild();
-                            ResultSet set = result.getResult();
-                            boolean special = "Weekly Discussion Mute".equals(set.getString("reason"));
                             
-                            if (special) {
-                                TextChannel channel = guild.getTextChannelById(DiscussionMuteCommand.DISCUSSION_CHANNEL);
-                                channel.getPermissionOverride(member).delete().queue();
-                                
-                            } else {
-                                guild.removeRoleFromMember(member, guild.getRoleById(MuteCommand.ROLE_ID)).queue();
-                            }
+                            guild.removeRoleFromMember(member, guild.getRoleById(MuteCommand.ROLE_ID)).queue();
                             
                             new DatabaseQuery()
                                     .query(new BasicQuery("UPDATE owen.muted_members SET handled = true WHERE member = ?", (statement) -> statement.setLong(1, member.getIdLong())))
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/VerifyCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/VerifyCommand.java
similarity index 92%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/VerifyCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/VerifyCommand.java
index 032166ad..a0c46702 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/VerifyCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/mod/VerifyCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.mod;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.*;
@@ -84,6 +84,11 @@ public void run(CommandEvent event) {
                         guild.addRoleToMember(member, guild.getRoleById((VerifyCommand.ROLE_ID))).queue();
     
                         // Run the query before any messages sent to make sure that they are actually added.
+                        new DatabaseQuery()
+                                .query(new BasicQuery("UPDATE linked_accounts SET discord_id = null WHERE discord_id = ? ", (statement) -> {
+                                    statement.setString(1, userString);
+                                })).compile();
+                        
                         new DatabaseQuery()
                                 .query(new BasicQuery("INSERT INTO linked_accounts (player_uuid, player_name, discord_id) VALUES (?,?,?) ON DUPLICATE KEY UPDATE discord_id = ?", (statement) -> {
                                     statement.setString(1, uuid);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/AddTagSubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/AddTagSubCommand.java
new file mode 100644
index 00000000..c644965a
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/AddTagSubCommand.java
@@ -0,0 +1,84 @@
+package com.diamondfire.helpbot.bot.command.impl.other.tag;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.*;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.SubCommand;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.tag.*;
+import com.diamondfire.helpbot.sys.tag.exceptions.TagAlreadyExistsException;
+
+import java.io.IOException;
+
+public class AddTagSubCommand extends SubCommand {
+    
+    @Override
+    public String getName() {
+        return "add";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .addArgument(
+                        new HelpContextArgument()
+                                .name("activator"),
+                        new HelpContextArgument()
+                                .name("title"),
+                        new HelpContextArgument()
+                                .name("response")
+                );
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet().addArgument(
+                "activator", new StringArgument()
+        ).addArgument(
+                "title", new QuoteStringArgument()
+        ).addArgument(
+                "response", new EndlessStringArgument()
+        );
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.SR_HELPER
+                .setOverrides(this, 808966728201666620L);
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        // Get new activator, title and response
+        String activator = event.getArgument("activator");
+        String title = event.getArgument("title");
+        String response = event.getArgument("response");
+        response = response.replace("\\n", "\n");
+        
+        // Construct Tag
+        Tag tag = new Tag(activator, title, response, event.getAuthor().getIdLong(), "");
+    
+        // Reply with result
+        try {
+            TagHandler.newTag(tag);
+            
+            event.reply(new PresetBuilder()
+                    .withPreset(
+                            new InformativeReply(InformativeReplyType.SUCCESS,
+                                    "Success", "Successfully added a new tag.")
+                    ));
+        } catch (TagAlreadyExistsException | IOException err) {
+            
+            event.reply(new PresetBuilder()
+                    .withPreset(
+                            new InformativeReply(InformativeReplyType.ERROR, err.getMessage())
+                    ));
+        }
+    }
+    
+}
+
+
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/EditTagSubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/EditTagSubCommand.java
new file mode 100644
index 00000000..754def3b
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/EditTagSubCommand.java
@@ -0,0 +1,89 @@
+package com.diamondfire.helpbot.bot.command.impl.other.tag;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.*;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.Enum.*;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.SubCommand;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.tag.*;
+import com.diamondfire.helpbot.sys.tag.exceptions.TagDoesNotExistException;
+
+import java.io.IOException;
+
+public class EditTagSubCommand extends SubCommand {
+    
+    @Override
+    public String getName() {
+        return "edit";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .addArgument(
+                        new HelpContextArgument()
+                            .name("activator"),
+                        new HelpContextArgument()
+                            .name("property")
+                );
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet().addArgument(
+                "activator", new StringArgument()
+        ).addArgument(
+                "property", new EnumArgument<TagProperty>()
+                        .setEnum(TagProperty.class)
+        ).addArgument(
+                "newValue", new EndlessStringArgument()
+        );
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.SR_HELPER
+                .setOverrides(this, 808966728201666620L);
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        
+        // Get activator, property and newValue
+        String activator = event.getArgument("activator");
+        TagProperty property = event.getArgument("property");
+        String newValue = event.getArgument("newValue");
+        
+        if (property == TagProperty.IMAGE && newValue.equals("none")) {
+            newValue = "";
+        }
+    
+        try {
+            Tag tag = TagHandler.getTag(activator);
+            property.set(tag, newValue);
+            TagHandler.save();
+            
+            event.reply(new PresetBuilder()
+                    .withPreset(
+                            new InformativeReply(InformativeReplyType.SUCCESS,
+                                    "Successfully modified tag.")
+                    ));
+            
+        } catch (TagDoesNotExistException | IOException err) {
+            event.reply(new PresetBuilder()
+                    .withPreset(
+                            new InformativeReply(InformativeReplyType.ERROR,
+                                    err.getMessage())
+                    ));
+            
+            err.printStackTrace();
+        }
+    }
+    
+}
+
+
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/ListTagsSubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/ListTagsSubCommand.java
new file mode 100644
index 00000000..3c8c3eeb
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/ListTagsSubCommand.java
@@ -0,0 +1,64 @@
+package com.diamondfire.helpbot.bot.command.impl.other.tag;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.help.HelpContext;
+import com.diamondfire.helpbot.bot.command.impl.SubCommand;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.tag.*;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class ListTagsSubCommand extends SubCommand {
+    
+    @Override
+    public String getName() {
+        return "list";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext();
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet();
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        String formattedTags = TagHandler.getTags().stream()
+                .map(tag -> String.format("`%s`", tag.getActivator()))
+                .collect(Collectors.joining(" "));
+    
+        if (formattedTags.isEmpty()) {
+            formattedTags = "*None*";
+        }
+    
+        event.reply(new PresetBuilder()
+                .withPreset(
+                        new InformativeReply(InformativeReplyType.INFO, "Tags",
+                                String.format("""
+                                                A list of all custom command tags added.
+                                                You can execute a tag using `%s<tag name>`.
+            
+                                                %s""",
+                                        HelpBotInstance.getConfig().getPrefix(), formattedTags))
+                ));
+    
+    }
+    
+}
+
+
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/RemoveTagSubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/RemoveTagSubCommand.java
new file mode 100644
index 00000000..6b018ae9
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/RemoveTagSubCommand.java
@@ -0,0 +1,71 @@
+package com.diamondfire.helpbot.bot.command.impl.other.tag;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.StringArgument;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.SubCommand;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.tag.*;
+import com.diamondfire.helpbot.sys.tag.exceptions.TagDoesNotExistException;
+
+import java.io.IOException;
+
+public class RemoveTagSubCommand extends SubCommand {
+    
+    @Override
+    public String getName() {
+        return "remove";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .addArgument(
+                        new HelpContextArgument()
+                            .name("activator")
+                );
+    }
+    
+    @Override
+    protected ArgumentSet compileArguments() {
+        return new ArgumentSet()
+                .addArgument(
+                        "activator", new StringArgument()
+                );
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.SR_HELPER
+                .setOverrides(this, 808966728201666620L);
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        // Get activator
+        String activator = event.getArgument("activator");
+        
+        try {
+            TagHandler.deleteTag(activator);
+            
+            event.reply(new PresetBuilder()
+                    .withPreset(
+                            new InformativeReply(InformativeReplyType.SUCCESS, String.format(
+                                    "Successfully deleted tag with activator `%s`.", activator))
+                    ));
+            
+        } catch (TagDoesNotExistException | IOException err) {
+            event.reply(new PresetBuilder()
+                    .withPreset(
+                            new InformativeReply(InformativeReplyType.ERROR,
+                                    err.getMessage())
+                    ));
+        }
+    }
+    
+}
+
+
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/TagCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/TagCommand.java
new file mode 100644
index 00000000..67597ee2
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/TagCommand.java
@@ -0,0 +1,46 @@
+package com.diamondfire.helpbot.bot.command.impl.other.tag;
+
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.*;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+
+public class TagCommand extends SubCommandHolder {
+    
+    @Override
+    public String getName() {
+        return "tag";
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("""
+                        Controls custom command tags. Notes:
+                        - Edit: Use "none" for image to remove the image.""")
+                .category(CommandCategory.OTHER)
+                .addArgument(
+                        new HelpContextArgument()
+                                .name("add/edit/remove/list"),
+                        new HelpContextArgument()
+                                .name("...")
+                                .optional()
+                );
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public SubCommand[] getSubCommands() {
+        return new SubCommand[]{
+                new AddTagSubCommand(),
+                new EditTagSubCommand(),
+                new RemoveTagSubCommand(),
+                new ListTagsSubCommand()
+        };
+    }
+}
+
+
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/AbstractFileListCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/AbstractFileListCommand.java
similarity index 88%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/AbstractFileListCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/AbstractFileListCommand.java
index 0ce9c7f8..7d8172c4 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/AbstractFileListCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/AbstractFileListCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.util;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.impl.Command;
@@ -7,6 +7,7 @@
 import com.diamondfire.helpbot.df.codeinfo.codedatabase.db.datatypes.CodeObject;
 import com.diamondfire.helpbot.sys.externalfile.ExternalFileUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.io.*;
 import java.util.*;
@@ -39,10 +40,10 @@ protected void generate(CommandEvent event, List<? extends CodeObject> data) {
         } catch (IOException e) {
             EmbedBuilder builder = new EmbedBuilder();
             builder.setTitle("Could not generate file!");
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             return;
         }
         
-        event.getChannel().sendMessage("File Generated").addFile(file).queue();
+        event.getChannel().sendMessage("File Generated").addFiles(FileUpload.fromData(file)).queue();
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/BulkExecuteCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/BulkExecuteCommand.java
similarity index 91%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/BulkExecuteCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/BulkExecuteCommand.java
index 4933ef5d..80e2135a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/BulkExecuteCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/BulkExecuteCommand.java
@@ -1,6 +1,6 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.util;
 
-import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.MultiArgumentContainer;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.*;
@@ -43,7 +43,7 @@ public boolean cacheArgumentSet() {
     @Override
     public ArgumentSet compileArguments() {
         List<String> playerCommands = new ArrayList<>();
-        for (Command command : HelpBotInstance.getHandler().getCommands().values()) {
+        for (Command command : CommandHandler.getInstance().getCommands().values()) {
             if (command instanceof AbstractPlayerUUIDCommand) {
                 playerCommands.add(command.getName());
             }
@@ -58,7 +58,7 @@ public ArgumentSet compileArguments() {
     
     @Override
     public Permission getPermission() {
-        return Permission.EXPERT;
+        return Permission.SR_HELPER;
     }
     
     @Override
@@ -69,7 +69,7 @@ public void run(CommandEvent event) {
         
         for (String player : playerNames) {
             try {
-                Command command1 = HelpBotInstance.getHandler().getCommands().get(command);
+                Command command1 = CommandHandler.getInstance().getCommands().get(command);
                 Field field = event.getClass().getDeclaredField("command");
                 field.trySetAccessible();
                 field.set(event, command1);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MimicCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/MimicCommand.java
similarity index 95%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MimicCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/MimicCommand.java
index 5580d8a6..caebb61d 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/MimicCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/MimicCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.util;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.MessageArgument;
@@ -39,7 +39,6 @@ public Permission getPermission() {
     @Override
     public void run(CommandEvent event) {
         String msg = event.getArgument("msg");
-        
         event.getMessage().delete().queue();
         event.getChannel().sendMessage(msg).queue();
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PollCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/PollCommand.java
similarity index 92%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PollCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/PollCommand.java
index 7a9cef95..7e4bd99d 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/PollCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/PollCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.other;
+package com.diamondfire.helpbot.bot.command.impl.other.util;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.MessageArgument;
@@ -10,6 +10,7 @@
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 
 import java.awt.*;
 import java.util.*;
@@ -42,7 +43,7 @@ public ArgumentSet compileArguments() {
     
     @Override
     public Permission getPermission() {
-        return Permission.DEVELOPER;
+        return Permission.ADMINISTRATOR;
     }
     
     @Override
@@ -99,12 +100,12 @@ public void run(CommandEvent event) {
         builder.setDescription(String.join(" ", fullPollOptions)); //adds poll options
         builder.setColor(new Color(33, 40, 97));
         
-        event.getChannel().sendMessage(builder.build()).queue((message) -> { //send embed message
+        event.getChannel().sendMessageEmbeds(builder.build()).queue((message) -> { //send embed message
             
             //add reactions
             Deque<String> nums = Util.getUnicodeNumbers();
             for (String option : pollOptions) {
-                message.addReaction(nums.pop()).queue();
+                message.addReaction(Emoji.fromUnicode(nums.pop())).queue();
             }
             
         });
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/SolvedCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/SolvedCommand.java
new file mode 100644
index 00000000..7ecf2f2b
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/SolvedCommand.java
@@ -0,0 +1,79 @@
+package com.diamondfire.helpbot.bot.command.impl.other.util;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.util.SolvedPostManager;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.concrete.*;
+
+
+public class SolvedCommand extends Command {
+    
+    @Override
+    public String getName() {
+        return "solved";
+    }
+    
+    @Override
+    public String[] getAliases() {
+        return new String[]{"solve", "resolved"};
+    }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Marks the help post as solved.")
+                .category(CommandCategory.OTHER);
+    }
+    
+    @Override
+    public ArgumentSet compileArguments() {
+        return new ArgumentSet();
+    }
+    
+    @Override
+    public Permission getPermission() {
+        return Permission.USER;
+    }
+    
+    @Override
+    public void run(CommandEvent event) {
+        // Limit to help forum.
+        if (event.getChannel().getType() != ChannelType.GUILD_PUBLIC_THREAD ||
+                event.getChannel().asThreadChannel().getParentChannel().getIdLong() != HelpBotInstance.getConfig().getHelpChannel()) {
+            
+            event.reply(new PresetBuilder().withPreset(
+                    new InformativeReply(InformativeReplyType.ERROR, "Command can only be used in <#" + HelpBotInstance.getConfig().getHelpChannel() + ">")
+            ));
+            return;
+        }
+        
+        ThreadChannel threadChannel = event.getChannel().asThreadChannel();
+        
+        // Check if the command is used by the post owner.
+        if (event.getMember() == null || threadChannel.getOwnerIdLong() != event.getMember().getIdLong()) {
+            event.reply(new PresetBuilder().withPreset(
+                    new InformativeReply(InformativeReplyType.ERROR, "Command can only be used by the post owner.")
+            ));
+            return;
+        }
+        
+        // Check if the post already has the solved tag.
+        if (SolvedPostManager.isSolved(threadChannel)) {
+            event.reply(new PresetBuilder().withPreset(
+                    new InformativeReply(InformativeReplyType.ERROR, "Post is already solved.")
+            ));
+            return;
+        }
+        
+        // Apply the solved tag.
+        SolvedPostManager.addSolved(threadChannel);
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/AbstractPlayerUUIDCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/AbstractPlayerUUIDCommand.java
index 0728bae2..add6574e 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/AbstractPlayerUUIDCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/AbstractPlayerUUIDCommand.java
@@ -2,10 +2,13 @@
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
-import com.diamondfire.helpbot.bot.command.argument.impl.types.StringArgument;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.*;
 import com.diamondfire.helpbot.bot.command.impl.Command;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.util.Util;
 
 public abstract class AbstractPlayerUUIDCommand extends Command {
     
@@ -13,7 +16,7 @@ public abstract class AbstractPlayerUUIDCommand extends Command {
     public ArgumentSet compileArguments() {
         return new ArgumentSet()
                 .addArgument("player",
-                        new SingleArgumentContainer<>(new StringArgument()).optional(null));
+                        new SingleArgumentContainer<>(new DFPlayerArgument()).optional(null));
     }
     
     @Override
@@ -23,16 +26,27 @@ public Permission getPermission() {
     
     @Override
     public void run(CommandEvent event) {
-        String player = event.getArgument("player");
-        
+        Player player = event.getArgument("player");
         if (player == null) {
-            execute(event, event.getMember().getEffectiveName());
+            // If no player is specified, use the member's name,
+            // however, non-verified members can set their display name
+            // to any player and run commands as that player; therefore,
+            // we need to check if the member is verified.
+            if (!event.getMember().getRoles().contains(event.getGuild().getRoleById(Util.VERIFIED))) {
+                PresetBuilder preset = new PresetBuilder()
+                        .withPreset(
+                                new InformativeReply(InformativeReplyType.ERROR, "You must be verified to use this command!")
+                        );
+                event.reply(preset);
+                return;
+            }
+            execute(event, DFPlayerArgument.fetchPlayer(event.getMember().getEffectiveName()));
         } else {
             execute(event, player);
         }
     }
     
-    protected abstract void execute(CommandEvent event, String player);
+    protected abstract void execute(CommandEvent event, Player player);
     
 }
 
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/BoostersCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/BoostersCommand.java
index f1a84c73..00b5543d 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/BoostersCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/BoostersCommand.java
@@ -9,15 +9,14 @@
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
-import com.diamondfire.helpbot.util.FormatUtil;
-import com.diamondfire.helpbot.util.Util;
+import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Emote;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 
 import java.sql.ResultSet;
 
 public class BoostersCommand extends Command {
-    private static long[] emotes = new long[]{809172442957217812L, 809172442496630815L};
+    private static final long[] emotes = new long[]{809172442957217812L, 809172442496630815L};
     
     @Override
     public String getName() {
@@ -67,8 +66,8 @@ public void run(CommandEvent event) {
                         int multiplier = set.getInt("multiplier");
                         String durationName = FormatUtil.formatMilliTime(set.getLong("end_time") - System.currentTimeMillis());
                         
-                        Emote emote = event.getJDA().getEmoteById(emotes[Util.clamp(multiplier - 2, 0, emotes.length - 1)]);
-                        embed.addField(String.format("%s %sx booster from %s ", emote.getAsMention(), multiplier, owner), String.format("Ends in: %s", durationName), false);
+                        Emoji emote = event.getJDA().getEmojiById(emotes[Util.clamp(multiplier - 2, 0, emotes.length - 1)]);
+                        embed.addField(String.format("%s %sx booster from %s ", emote.getFormatted(), multiplier, owner), String.format("Ends in: %s", durationName), false);
                     }
                     
                     event.reply(preset);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/RetiredListCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/RetiredListCommand.java
index b4175b19..ca6d982d 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/RetiredListCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/RetiredListCommand.java
@@ -8,7 +8,7 @@
 import com.diamondfire.helpbot.df.ranks.*;
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
-import com.diamondfire.helpbot.sys.reactions.multiselector.MultiSelectorBuilder;
+import com.diamondfire.helpbot.sys.multiselector.MultiSelectorBuilder;
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.EmbedBuilder;
 
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java
index 04d58d84..53e3fa5b 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java
@@ -8,7 +8,7 @@
 import com.diamondfire.helpbot.df.ranks.*;
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
-import com.diamondfire.helpbot.sys.reactions.multiselector.MultiSelectorBuilder;
+import com.diamondfire.helpbot.sys.multiselector.MultiSelectorBuilder;
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.*;
@@ -60,7 +60,7 @@ public void run(CommandEvent event) {
                     registerRank(ranks,
                             Rank.JRHELPER,
                             Rank.HELPER,
-                            Rank.EXPERT,
+                            Rank.SR_HELPER,
                             Rank.JRMOD,
                             Rank.MOD,
                             Rank.SR_MOD,
@@ -85,7 +85,7 @@ public void run(CommandEvent event) {
                     }
                     
                     EmbedBuilder supportPage = new EmbedBuilder();
-                    EmbedUtil.addFields(supportPage, ranks.get(Rank.EXPERT), "", "Experts");
+                    EmbedUtil.addFields(supportPage, ranks.get(Rank.SR_HELPER), "", "SrHelpers");
                     EmbedUtil.addFields(supportPage, ranks.get(Rank.HELPER), "", "Helpers");
                     EmbedUtil.addFields(supportPage, ranks.get(Rank.JRHELPER), "", "JrHelpers");
                     builder.addPage("Support", supportPage);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/graph/AbstractGraphCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/graph/AbstractGraphCommand.java
index ca7aea34..ebf43de6 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/graph/AbstractGraphCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/graph/AbstractGraphCommand.java
@@ -6,7 +6,7 @@
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.sys.graph.generators.*;
-import com.diamondfire.helpbot.sys.graph.generators.context.TimeGraphContext;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 public abstract class AbstractGraphCommand<T> extends Command {
     
@@ -28,7 +28,7 @@ public Permission getPermission() {
     public void run(CommandEvent event) {
         T context = createContext(event);
         
-        event.getChannel().sendFile(getGraphGenerator().createGraph(context)).queue();
+        event.getChannel().sendFiles(FileUpload.fromData(getGraphGenerator().createGraph(context))).queue();
     }
     
     public abstract GraphGenerator<T> getGraphGenerator();
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/CpCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/CpCommand.java
index b91b5166..968e282f 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/CpCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/CpCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -14,6 +15,7 @@
 import com.diamondfire.helpbot.sys.graph.impl.ChartGraphBuilder;
 import com.diamondfire.helpbot.util.FormatUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.sql.ResultSet;
 import java.util.*;
@@ -49,17 +51,16 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
                         new InformativeReply(InformativeReplyType.INFO, "CP Info", null)
                 );
         EmbedBuilder embed = preset.getEmbed();
-        
+    
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT * FROM creator_rankings WHERE uuid = ? OR name = ?;", (statement) -> {
-                    statement.setString(1, player);
-                    statement.setString(2, player);
+                .query(new BasicQuery("SELECT * FROM creator_rankings WHERE uuid = ?;", (statement) -> {
+                    statement.setString(1, player.uuidString());
                 }))
                 .compile()
                 .run((table) -> {
@@ -69,29 +70,29 @@ protected void execute(CommandEvent event, String player) {
                         event.reply(preset);
                         return;
                     }
-                    
+                
                     ResultSet set = table.getResult();
-                    
+                
                     int points = set.getInt("points");
                     int rank = set.getInt("cur_rank");
                     CreatorLevel level = CreatorLevel.getLevel(rank);
                     CreatorLevel nextLevel = CreatorLevel.getNextLevel(CreatorLevel.getLevel(rank));
                     int nextLevelReq = nextLevel.getRequirementProvider().getRequirement();
-                    
+                
                     String formattedName = set.getString("name");
                     String uuid = set.getString("uuid");
                     preset.withPreset(
                             new MinecraftUserPreset(formattedName, uuid)
                     );
-                    
+                
                     embed.addField("Current Rank", level.display(true), false);
                     embed.addField("Current Points", genPointMetric(points, uuid), false);
-                    
+                
                     new DatabaseQuery()
                             .query(new BasicQuery("SELECT * FROM owen.creator_rankings_log WHERE uuid = ? ORDER BY points DESC LIMIT 1", (statement) -> statement.setString(1, uuid)))
                             .compile()
                             .run((tableSet) -> {
-                                
+                            
                                 if (!tableSet.isEmpty()) {
                                     int maxPoints = tableSet.getResult().getInt("points");
                                     if (maxPoints > points) {
@@ -101,17 +102,17 @@ protected void execute(CommandEvent event, String player) {
                                     }
                                 }
                             });
-                    
+                
                     new DatabaseQuery()
                             .query(new BasicQuery("SELECT COUNT(*) + 1 AS place FROM creator_rankings WHERE points > ?", (statement) -> statement.setInt(1, points)))
                             .compile()
                             .run((tableSet) -> embed.addField("Current Leaderboard Place", FormatUtil.formatNumber(tableSet.getResult().getInt("place")), false));
-                    
+                
                     if (level != CreatorLevel.DIAMOND) {
                         embed.addField("Next Rank", nextLevel.display(true), true);
                         embed.addField("Next Rank Points", FormatUtil.formatNumber(nextLevelReq) + String.format(" (%s to go)", FormatUtil.formatNumber(nextLevelReq - points)), false);
                     }
-                    
+                
                     new DatabaseQuery()
                             .query(new BasicQuery("SELECT DATE_FORMAT(date, '%d-%m') AS time,points FROM owen.creator_rankings_log WHERE uuid = ?;", (statement) -> statement.setString(1, uuid)))
                             .compile()
@@ -120,24 +121,24 @@ protected void execute(CommandEvent event, String player) {
                                     event.reply(preset);
                                     return;
                                 }
-                                
+                            
                                 Map<GraphableEntry<?>, Integer> entries = new LinkedHashMap<>();
                                 for (ResultSet rs : resultTable) {
                                     entries.put(new StringEntry(rs.getString("time")), rs.getInt("points"));
                                 }
-                                
+                            
                                 embed.setImage("attachment://graph.png");
                                 try {
                                     event.getReplyHandler().replyA(preset)
-                                            .addFile(new ChartGraphBuilder()
-                                                    .setGraphName(player + "'s CP Graph")
-                                                    .createGraph(entries), "graph.png")
+                                            .addFiles(FileUpload.fromData(new ChartGraphBuilder()
+                                                    .setGraphName(player.name() + "'s CP Graph")
+                                                    .createGraph(entries), "graph.png"))
                                             .queue();
                                 } catch (Exception ignored) {
                                     event.reply(preset);
                                 }
                             });
-                    
+                
                 });
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/HistoryCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/HistoryCommand.java
index 48186ae6..3db5b07b 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/HistoryCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/HistoryCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -9,17 +10,15 @@
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.df.punishments.*;
 import com.diamondfire.helpbot.df.punishments.fetcher.PunishmentFetcher;
-import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
-import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.externalfile.ExternalFileUtil;
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.requests.restaction.MessageAction;
+import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.awt.*;
 import java.io.*;
 import java.nio.file.Files;
-import java.sql.ResultSet;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
@@ -42,7 +41,11 @@ public String[] getAliases() {
     public HelpContext getHelpContext() {
         return new HelpContext()
                 .description("Sends you your punishment history.")
-                .category(CommandCategory.PLAYER_STATS);
+                .category(CommandCategory.PLAYER_STATS)
+                .addArgument(new HelpContextArgument()
+                        .name("player|uuid")
+                        .optional()
+                );
     }
     
     @Override
@@ -51,151 +54,133 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
-        String name;
-        if (!Permission.MODERATION.hasPermission(event.getMember())) {
-            name = event.getMember().getEffectiveName();
-        } else {
-            name = player;
+    protected void execute(CommandEvent event, Player player) {
+        if (!Permission.MODERATION.hasPermission(event.getMember()) && !event.getMember().getEffectiveName().equals(player.name())) {
+            PresetBuilder activePunishmentsPreset = new PresetBuilder()
+                    .withPreset(
+                            new InformativeReply(InformativeReplyType.ERROR, "You must be a moderator inorder to see other peoples history!")
+                    );
+            
+            event.reply(activePunishmentsPreset);
+            
+            return;
         }
         
-        new DatabaseQuery()
-                .query(new BasicQuery("SELECT * FROM players WHERE players.name = ? OR players.uuid = ? LIMIT 1;", (statement) -> {
-                    statement.setString(1, name);
-                    statement.setString(2, name);
-                }))
-                .compile()
-                .run((table) -> {
-                    if (table.isEmpty()) {
-                        PresetBuilder notFound = new PresetBuilder()
-                                .withPreset(new InformativeReply(InformativeReplyType.ERROR, "Player was not found."));
-                        
-                        event.reply(notFound);
-                        return;
+        List<MessageCreateAction> msgs = new ArrayList<>();
+        List<Punishment> punishments = new PunishmentFetcher()
+                .withUUID(player.uuidString())
+                .withAll()
+                .fetch();
+        
+        event.getMember().getUser().openPrivateChannel().queue((privateChannel) -> {
+            // Retrieve active punishments
+            {
+                PresetBuilder activePunishmentsPreset = new PresetBuilder()
+                        .withPreset(
+                                new MinecraftUserPreset(player),
+                                new InformativeReply(InformativeReplyType.INFO, "History Recap", null)
+                        );
+                EmbedBuilder embed = activePunishmentsPreset.getEmbed();
+                
+                List<String> activePunishments = new ArrayList<>();
+                int warnings = 0;
+                int yearlyWarnings = 0;
+                for (Punishment punishment : punishments) {
+                    if (punishment.active) {
+                        activePunishments.add(punishment.toString());
+                    }
+                    if (punishment.type == PunishmentType.WARN) {
+                        if (ChronoUnit.DAYS.between(punishment.startTime.toInstant(), Instant.now()) <= 365) {
+                            yearlyWarnings++;
+                        }
+                        warnings++;
                     }
+                }
+                punishments.removeIf((punishment) -> punishment.active);
+                
+                if (activePunishments.size() > 0) {
+                    activePunishmentsPreset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Active Punishments", null));
+                    EmbedUtil.addFields(embed, activePunishments, "", true);
                     
-                    ResultSet set = table.getResult();
-                    String playerName = set.getString("name");
-                    String playerUUID = set.getString("uuid");
-                    List<MessageAction> msgs = new ArrayList<>();
-                    List<Punishment> punishments = new PunishmentFetcher()
-                            .withUUID(playerUUID)
-                            .withAll()
-                            .fetch();
+                    String duration = null;
+                    int warningReq = 0;
+                    if (warnings < 4 && warnings > 1) {
+                        duration = "30 minute";
+                        warningReq = 4 - warnings;
+                    } else if (warnings < 5) {
+                        duration = "1 hour";
+                        warningReq = 5 - warnings;
+                    } else if (warnings < 6) {
+                        duration = "12 hour";
+                        warningReq = 6 - warnings;
+                    }
                     
-                    event.getMember().getUser().openPrivateChannel().queue((privateChannel) -> {
-                        // Retrieve active punishments
-                        {
-                            PresetBuilder activePunishmentsPreset = new PresetBuilder()
-                                    .withPreset(
-                                            new MinecraftUserPreset(playerName, playerUUID),
-                                            new InformativeReply(InformativeReplyType.INFO, "History Recap", null)
-                                    );
-                            EmbedBuilder embed = activePunishmentsPreset.getEmbed();
-                            
-                            List<String> activePunishments = new ArrayList<>();
-                            int warnings = 0;
-                            int yearlyWarnings = 0;
-                            for (Punishment punishment : punishments) {
-                                if (punishment.active) {
-                                    activePunishments.add(punishment.toString());
-                                }
-                                if (punishment.type == PunishmentType.WARN) {
-                                    if (ChronoUnit.DAYS.between(punishment.startTime.toInstant(), Instant.now()) <= 365) {
-                                        yearlyWarnings++;
-                                    }
-                                    warnings++;
-                                }
-                            }
-                            punishments.removeIf((punishment) -> punishment.active);
-                            
-                            if (activePunishments.size() > 0) {
-                                activePunishmentsPreset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Active Punishments", null));
-                                EmbedUtil.addFields(embed, activePunishments, "", true);
-                                
-                                String duration = null;
-                                int warningReq = 0;
-                                if (warnings < 4 && warnings > 1) {
-                                    duration = "30 minute";
-                                    warningReq = 4 - warnings;
-                                } else if (warnings < 5) {
-                                    duration = "1 hour";
-                                    warningReq = 5 - warnings;
-                                } else if (warnings < 6) {
-                                    duration = "12 hour";
-                                    warningReq = 6 - warnings;
-                                }
-                                
-                                if (duration != null) {
-                                    embed.addField("Tempban", String.format("\u26A0 If you receive **%s** more active %s, you will receive a **%s** tempban!", warningReq, StringUtil.sCheck("warning", warningReq), duration), false);
-                                }
-                                
-                            } else if (punishments.size() == 0) {
-                                embed.setDescription("No punishments here, keep up the good work!");
-                            }
-                            
-                            if (yearlyWarnings > 10) {
-                                embed.setColor(Color.RED);
-                                embed.addField("Tempban", String.format("\u26A0 If you receive **%s** more %s this year, you will receive a **45** day tempban!", 20 - yearlyWarnings, StringUtil.sCheck("warning", 20 - yearlyWarnings)), false);
-                            }
-                            
-                            msgs.add(privateChannel.sendMessage(embed.build()));
-                        }
-                        
-                        // Retrieve normal punishments
-                        {
-                            PresetBuilder punishmentsPreset = new PresetBuilder()
-                                    .withPreset(
-                                            new InformativeReply(InformativeReplyType.INFO, "Punishment History", null)
-                                    );
-                            EmbedBuilder presetBuilder = punishmentsPreset.getEmbed();
-                            List<String> punishmentStrings = new ArrayList<>();
-                            for (Punishment punishment : punishments) {
-                                punishmentStrings.add(punishment.toString());
-                            }
-                            
-                            EmbedUtil.addFields(presetBuilder, punishmentStrings, "", "", true);
-                            if (punishmentStrings.size() == 0) {
-                            } else if (presetBuilder.isValidLength()) {
-                                msgs.add(privateChannel.sendMessage(presetBuilder.build()));
-                            } else {
-                                try {
-                                    File sendFile = ExternalFileUtil.generateFile("history.txt");
-                                    Files.writeString(sendFile.toPath(), String.join("\n", punishmentStrings));
-                                    msgs.add(privateChannel.sendFile(sendFile));
-                                } catch (IOException exception) {
-                                    exception.printStackTrace();
-                                }
-                            }
-                            
-                        }
-                        
-                        MessageAction action = msgs.get(0);
-                        msgs.remove(0);
-                        
-                        action.queue((msg) -> {
-                            PresetBuilder successMSG = new PresetBuilder()
-                                    .withPreset(
-                                            new InformativeReply(InformativeReplyType.SUCCESS, "Check your messages for history!"),
-                                            new MinecraftUserPreset(playerName, playerUUID)
-                                    );
-                            
-                            event.reply(successMSG);
-                            
-                            for (MessageAction msgAction : msgs) {
-                                msgAction.queue();
-                            }
-                        }, (error) -> {
-                            PresetBuilder errorMSG = new PresetBuilder()
-                                    .withPreset(new InformativeReply(InformativeReplyType.ERROR, "Could not send private message! Please check to make sure private messages are enabled."));
-                            event.reply(errorMSG);
-                        });
-                        
-                    });
-                });
-        
+//                    if (duration != null) {
+//                        embed.addField("Tempban", String.format("\u26A0 If you receive **%s** more active %s, you will receive a **%s** tempban!", warningReq, StringUtil.sCheck("warning", warningReq), duration), false);
+//                    }
+                    
+                } else if (punishments.size() == 0) {
+                    embed.setDescription("No punishments here, keep up the good work!");
+                }
+//
+//                if (yearlyWarnings > 10) {
+//                    embed.setColor(Color.RED);
+//                    embed.addField("Tempban", String.format("\u26A0 If you receive **%s** more %s this year, you will receive a **45** day tempban!", 20 - yearlyWarnings, StringUtil.sCheck("warning", 20 - yearlyWarnings)), false);
+//                }
+                
+                msgs.add(privateChannel.sendMessageEmbeds(embed.build()));
+            }
+            
+            // Retrieve normal punishments
+            {
+                PresetBuilder punishmentsPreset = new PresetBuilder()
+                        .withPreset(
+                                new InformativeReply(InformativeReplyType.INFO, "Punishment History", null)
+                        );
+                EmbedBuilder presetBuilder = punishmentsPreset.getEmbed();
+                List<String> punishmentStrings = new ArrayList<>();
+                for (Punishment punishment : punishments) {
+                    punishmentStrings.add(punishment.toString());
+                }
+                
+                EmbedUtil.addFields(presetBuilder, punishmentStrings, "", "", true);
+                if (punishmentStrings.size() == 0) {
+                } else if (presetBuilder.isValidLength()) {
+                    msgs.add(privateChannel.sendMessageEmbeds(presetBuilder.build()));
+                } else {
+                    try {
+                        File sendFile = ExternalFileUtil.generateFile("history.txt");
+                        Files.writeString(sendFile.toPath(), String.join("\n", punishmentStrings));
+                        msgs.add(privateChannel.sendFiles(FileUpload.fromData(sendFile)));
+                    } catch (IOException exception) {
+                        exception.printStackTrace();
+                    }
+                }
+                
+            }
+            
+            MessageCreateAction action = msgs.get(0);
+            msgs.remove(0);
+            
+            action.queue((msg) -> {
+                PresetBuilder successMSG = new PresetBuilder()
+                        .withPreset(
+                                new InformativeReply(InformativeReplyType.SUCCESS, "Check your messages for history!"),
+                                new MinecraftUserPreset(player)
+                        );
+                
+                event.reply(successMSG);
+                
+                for (MessageCreateAction msgAction : msgs) {
+                    msgAction.queue();
+                }
+            }, (error) -> {
+                PresetBuilder errorMSG = new PresetBuilder()
+                        .withPreset(new InformativeReply(InformativeReplyType.ERROR, "Could not send private message! Please check to make sure private messages are enabled."));
+                event.reply(errorMSG);
+            });
+            
+        });
     }
+    
 }
-
-
-
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/LastJoinedCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/LastJoinedCommand.java
index a7aa9605..399d7f1a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/LastJoinedCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/LastJoinedCommand.java
@@ -1,20 +1,25 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
-import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
+import com.diamondfire.helpbot.bot.command.help.CommandCategory;
+import com.diamondfire.helpbot.bot.command.help.HelpContext;
+import com.diamondfire.helpbot.bot.command.help.HelpContextArgument;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
 import com.diamondfire.helpbot.bot.command.reply.feature.MinecraftUserPreset;
-import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.InformativeReply;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.InformativeReplyType;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.util.FormatUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.utils.TimeFormat;
 
-import java.sql.*;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
 import java.time.temporal.ChronoUnit;
-import java.util.concurrent.TimeUnit;
 
 public class LastJoinedCommand extends AbstractPlayerUUIDCommand {
     
@@ -41,53 +46,28 @@ public HelpContext getHelpContext() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
-                        new MinecraftUserPreset(player),
+                        new MinecraftUserPreset(player.name()),
                         new InformativeReply(InformativeReplyType.INFO, null, null)
                 );
         EmbedBuilder embed = preset.getEmbed();
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT players.uuid,players.name FROM players WHERE players.uuid = ? OR players.name = ?;", (statement) -> {
-                    statement.setString(1, player);
-                    statement.setString(2, player);
-                }))
+                .query(new BasicQuery("SELECT time AS time FROM player_join_log WHERE uuid = ? ORDER BY time DESC LIMIT 1;", (statement) -> statement.setString(1, player.uuidString())))
                 .compile()
-                .run((result) -> {
-                    if (result.isEmpty()) {
-                        preset.getEmbed().clear();
-                        preset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Player not found!"));
+                .run((resultTableDate) -> {
+                    if (resultTableDate.isEmpty()) {
+                        embed.addField("Last Seen", "A long time ago...", false);
                         return;
                     }
                     
-                    ResultSet set = result.getResult();
-                    String formattedName = set.getString("name");
-                    preset.withPreset(
-                            new MinecraftUserPreset(formattedName)
-                    );
-                    new DatabaseQuery()
-                            .query(new BasicQuery("SELECT time AS time FROM player_join_log WHERE uuid = ? ORDER BY time DESC LIMIT 1;", (statement) -> statement.setString(1, set.getString("uuid"))))
-                            .compile()
-                            .run((resultTableDate) -> {
-                                if (resultTableDate.isEmpty()) {
-                                    embed.addField("Last Seen", "A long time ago...", false);
-                                    return;
-                                }
-                                
-                                ResultSet setTime = resultTableDate.getResult();
-                                Timestamp date = setTime.getTimestamp("time");
-                                if (Permission.EXPERT.hasPermission(event.getMember())) {
-                                    embed.setFooter("Last Seen");
-                                    embed.setTimestamp(date.toInstant().plus(5, ChronoUnit.HOURS));
-                                } else {
-                                    embed.addField("Last Seen", FormatUtil.formatDate(date), false);
-                                }
-                                
-                            });
+                    ResultSet setTime = resultTableDate.getResult();
+                    Timestamp date = setTime.getTimestamp("time");
+                    embed.addField("Last Seen", TimeFormat.RELATIVE.format(date.getTime()), false);
+    
                 });
         
         event.reply(preset);
     }
-    
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/NamesCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/NamesCommand.java
index f4a502a9..d2db7454 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/NamesCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/NamesCommand.java
@@ -1,5 +1,8 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.*;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -44,12 +47,13 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder();
         EmbedBuilder embed = preset.getEmbed();
         try {
-            JsonObject profile = Util.getPlayerProfile(player);
-            
+            JsonObject profile = Util.getPlayerProfile(player.name());
+        
+            // Incase api fails. Shrug
             if (profile == null) {
                 preset.withPreset(
                         new InformativeReply(InformativeReplyType.ERROR, "Player not found!")
@@ -57,33 +61,34 @@ protected void execute(CommandEvent event, String player) {
                 event.reply(preset);
                 return;
             }
-            
+        
             List<String> names = new ArrayList<>();
             String displayName = profile.get("name").getAsString();
             for (JsonElement nameElement : profile.get("name_history").getAsJsonArray()) {
                 JsonObject obj = nameElement.getAsJsonObject();
                 JsonElement changedAt = obj.get("changedToAt");
-                
+            
                 preset.withPreset(
                         new MinecraftUserPreset(displayName),
                         new InformativeReply(InformativeReplyType.INFO, String.format("%s's Name Changes", displayName), null)
                 );
-                
+            
                 if (changedAt == null) {
                     names.add(String.format("%s", obj.get("name").getAsString()));
                 } else {
                     names.add(obj.get("name").getAsString() + String.format(" (%s)", FormatUtil.formatDate(DateUtil.toDate(changedAt.getAsLong()))));
                 }
-                
+            
             }
             Collections.reverse(names);
-            
+        
             EmbedUtil.addFields(embed, names);
         } catch (Exception e) {
             e.printStackTrace();
         }
         event.reply(preset);
     }
+    
 }
 
 
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/PlotsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/PlotsCommand.java
index 9d3c333f..42c599f8 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/PlotsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/PlotsCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -44,42 +45,37 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
-                        new InformativeReply(InformativeReplyType.INFO, "Owned Plots", null)
+                        new InformativeReply(InformativeReplyType.INFO, "Owned Plots", null),
+                        new MinecraftUserPreset(player)
                 );
+        
         EmbedBuilder embed = preset.getEmbed();
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT * FROM plots WHERE owner_name = ? OR owner = ? LIMIT 25;", (statement) -> {
-                    statement.setString(1, player);
-                    statement.setString(2, player);
+                .query(new BasicQuery("SELECT * FROM plots WHERE owner = ? LIMIT 25;", (statement) -> {
+                    statement.setString(1, player.uuidString());
                 }))
                 .compile()
                 .run((result) -> {
                     if (result.isEmpty()) {
-                        preset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Player was not found, or they have no plots."));
+                        preset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Player does not have any plots!"));
                         return;
                     }
                     
-                    ResultSet set = result.getResult();
-                    String formattedName = set.getString("owner_name");
-                    preset.withPreset(
-                            new MinecraftUserPreset(formattedName)
-                    );
-                    
                     for (ResultSet plot : result) {
                         String[] stats = {
                                 "Votes: " + plot.getInt("votes"),
                                 "Players: " + plot.getInt("player_count")
                         };
-                        embed.addField(StringUtil.display(plot.getString("name")) +
+                        embed.addField(StringUtil.fromMiniMessage(plot.getString("name")) +
                                         String.format(" **(%s)**", plot.getInt("id")),
                                 String.join("\n", stats), false);
-                        
+                    
                     }
                 });
-        
+    
         event.reply(preset);
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java
index 56748f8f..1ad39852 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -12,6 +13,7 @@
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.utils.TimeFormat;
 
 import java.sql.*;
 import java.util.*;
@@ -47,58 +49,57 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
-                        new InformativeReply(InformativeReplyType.INFO, "Profile", null)
+                        new InformativeReply(InformativeReplyType.INFO, "Profile", null),
+                        new MinecraftUserPreset(player)
                 );
         EmbedBuilder embed = preset.getEmbed();
-        
+    
         new DatabaseQuery()
                 .query(new BasicQuery("SELECT * " +
                         "FROM ranks," +
                         "     players " +
                         "WHERE ranks.uuid = players.uuid" +
-                        "  AND (players.uuid = ? || players.name = ?)", (statement) -> {
-                    statement.setString(1, player);
-                    statement.setString(2, player);
+                        "  AND players.uuid = ?", (statement) -> {
+                    statement.setString(1, player.uuidString());
                 }))
                 .compile()
                 .run((result) -> {
-                    if (result.isEmpty()) {
-                        preset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Player was not found."));
-                        return;
-                    }
-                    
                     ResultSet set = result.getResult();
                     String playerName = set.getString("name");
                     String playerUUID = set.getString("uuid");
                     String whois = set.getString("whois");
+                    String pronouns = set.getString("pronouns");
+                    Timestamp joinDate = set.getTimestamp("join_date");
+                    
                     String rankString;
                     {
                         Rank highRank = RankUtil.getHighRank(set);
                         if (highRank == null) {
                             rankString = "";
                         } else {
-                            rankString = highRank.getRankEmote().getAsMention();
+                            rankString = highRank.getRankEmote().getFormatted();
                         }
                     }
                     
-                    preset.withPreset(new MinecraftUserPreset(playerName, playerUUID));
                     embed.addField("Name", rankString + " " + StringUtil.display(playerName), false);
                     embed.addField("UUID", playerUUID, false);
-                    embed.addField("Whois", StringUtil.display(whois.isEmpty() ? "N/A" : whois).replace("\\n", "\n"), false);
-                    
+                    embed.addField("Whois", StringUtil.fromMiniMessage(whois.isEmpty() ? "N/A" : whois).replace("\\n", "\n"), false);
+                    embed.addField("Pronouns", StringUtil.display(pronouns == null || pronouns.isEmpty() ? "N/A" : pronouns), false);
+                
                     Rank[] ranks = RankUtil.getRanks(set);
                     List<String> ranksList = new ArrayList<>();
                     for (Rank rank : ranks) {
                         ranksList.add(String.format("[%s]", rank.getRankName()));
                     }
-                    
+                
                     embed.addField("Ranks", String.join(" ", ranksList), false);
-                    
+                    embed.addField("Join Date", TimeFormat.DATE_TIME_SHORT.format(joinDate.getTime()), false);
+    
                     new DatabaseQuery()
-                            .query(new BasicQuery("SELECT * FROM (SELECT (SELECT date AS liteban_join FROM litebans.history WHERE uuid = ? ORDER BY date DESC LIMIT 1) temp FROM dual) AS liteban," +
+                            .query(new BasicQuery("SELECT * FROM " +
                                     "     (SELECT (SELECT date AS owen_join FROM owen.join_log WHERE uuid = ? ORDER BY date DESC LIMIT 1) temp FROM dual) AS owen_join," +
                                     "     (SELECT (SELECT COUNT(*) AS votes FROM plot_votes WHERE uuid = ?) temp FROM dual) AS votes," +
                                     "     (SELECT (SELECT tokens FROM user_tokens WHERE uuid = ?) temp FROM dual) AS credits," +
@@ -107,47 +108,26 @@ protected void execute(CommandEvent event, String player) {
                                 statement.setString(2, playerUUID);
                                 statement.setString(3, playerUUID);
                                 statement.setString(4, playerUUID);
-                                statement.setString(5, playerUUID);
                             }))
                             .compile()
                             .run((stats) -> {
                                 ResultSet statsSet = stats.getResult();
-                                
+                            
                                 embed.addField("Votes Given", FormatUtil.formatNumber(statsSet.getInt("votes.temp")), false);
                                 embed.addField("Tokens", FormatUtil.formatNumber(statsSet.getInt("credits.temp")), false);
-                                
+                            
                                 long discordId = statsSet.getLong("id.temp");
                                 if (discordId != 0L) {
                                     embed.addField("Discord User", "<@" + discordId + '>', false);
                                 } else {
                                     embed.addField("Discord User", "Not Verified", false);
                                 }
-                                
-                                Timestamp liteBanDate = statsSet.getTimestamp("liteban.temp");
-                                
-                                if (liteBanDate != null) {
-                                    Timestamp owenDate = statsSet.getTimestamp("owen_join.temp");
-                                    
-                                    if (owenDate == null) {
-                                        new DatabaseQuery()
-                                                .query(new BasicQuery("INSERT INTO owen.join_log (uuid,date) VALUES (?,?)", (statement) -> {
-                                                    statement.setString(1, playerUUID);
-                                                    statement.setTimestamp(2, liteBanDate);
-                                                })).compile();
-                                        embed.addField("Join Date", FormatUtil.formatDate(liteBanDate), false);
-                                    } else {
-                                        embed.addField("Join Date", FormatUtil.formatDate(owenDate), false);
-                                    }
-                                    
-                                } else {
-                                    embed.addField("Join Date", "Not Found", false);
-                                }
-                                
                             });
                 });
-        
+    
         event.reply(preset);
     }
+    
 }
 
 
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/SkinCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/SkinCommand.java
index 4cc19504..373b146a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/SkinCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/SkinCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -35,15 +36,16 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
-                        new InformativeReply(InformativeReplyType.INFO, String.format("%s's Skin", player), null),
+                        new InformativeReply(InformativeReplyType.INFO, String.format("%s's Skin", player.name()), null),
                         new MinecraftUserPreset(player)
                 );
+        
         //Discord didn't want to preview the skin, why? I don't know..
         EmbedBuilder embed = preset.getEmbed();
-        embed.setImage("https://external-content.duckduckgo.com/iu/?reload=" + System.currentTimeMillis() + "&u=" + "https://mc-heads.net/body/" + player + "/180");
+        embed.setImage("https://external-content.duckduckgo.com/iu/?reload=" + System.currentTimeMillis() + "&u=" + "https://mc-heads.net/body/" + player.name() + "/180");
         event.reply(preset);
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/UuidCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/UuidCommand.java
index 8b0d9edd..0053f4ee 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/UuidCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/UuidCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.individualized;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.HelpContext;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -8,6 +9,7 @@
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
+import com.diamondfire.helpbot.bot.command.help.HelpContextArgument;
 
 
 //Command exists for easy mobile copy and pasting
@@ -20,7 +22,10 @@ public String getName() {
     
     @Override
     public HelpContext getHelpContext() {
-        return new HelpContext();
+        return new HelpContext()
+                .addArgument(new HelpContextArgument()
+                        .name("player name|uuid")
+                        .optional());
     }
     
     @Override
@@ -29,23 +34,8 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
-        new DatabaseQuery()
-                .query(new BasicQuery("SELECT * FROM players WHERE players.name = ? OR players.uuid = ? LIMIT 1;", (statement) -> {
-                    statement.setString(1, player);
-                    statement.setString(2, player);
-                }))
-                .compile()
-                .run((result) -> {
-                    if (result.isEmpty()) {
-                        PresetBuilder preset = new PresetBuilder();
-                        preset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Player was not found."));
-                        event.reply(preset);
-                        return;
-                    }
-                    
-                    event.getReplyHandler().reply(result.getResult().getString("uuid"));
-                });
+    protected void execute(CommandEvent event, Player player) {
+        event.getReplyHandler().reply(player.uuidString());
     }
     
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/JoinDataCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinDataCommand.java
similarity index 93%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/JoinDataCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinDataCommand.java
index b95cbade..b86d5f65 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/JoinDataCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinDataCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.metrics;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
@@ -87,7 +87,7 @@ public void run(CommandEvent event) {
         String dateTo = FormatUtil.formatDate(sqlDateTo);
         // Players that joined within a week of a certain date
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT COUNT(*) AS count FROM (SELECT DISTINCT uuid FROM approved_users WHERE time BETWEEN ? AND ?) AS a;", (statement) -> {
+                .query(new BasicQuery("SELECT COUNT(*) AS count FROM (SELECT DISTINCT uuid FROM players WHERE join_date BETWEEN ? AND ?) AS a;", (statement) -> {
                     statement.setDate(1, sqlDate);
                     statement.setDate(2, sqlDateTo);
                 }))
@@ -111,8 +111,8 @@ public void run(CommandEvent event) {
         ranks.put(4, 0);
         
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT donor, COUNT(*) AS count FROM ranks WHERE donor != 0 AND uuid IN (SELECT DISTINCT uuid FROM approved_users " +
-                        "WHERE time BETWEEN ? AND ?) GROUP BY donor;", (statement) -> {
+                .query(new BasicQuery("SELECT donor, COUNT(*) AS count FROM ranks WHERE donor != 0 AND uuid IN (SELECT DISTINCT uuid FROM players " +
+                        "WHERE join_date BETWEEN ? AND ?) GROUP BY donor;", (statement) -> {
                     statement.setDate(1, sqlDate);
                     statement.setDate(2, sqlDateTo);
                 }))
@@ -146,8 +146,8 @@ public void run(CommandEvent event) {
         Date between2 = c.getTime();
         
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT COUNT(*) AS count FROM (SELECT DISTINCT uuid FROM approved_users " +
-                        "WHERE time BETWEEN ? AND ?) AS a WHERE uuid IN " +
+                .query(new BasicQuery("SELECT COUNT(*) AS count FROM (SELECT DISTINCT uuid FROM players " +
+                        "WHERE join_date BETWEEN ? AND ?) AS a WHERE uuid IN " +
                         "(SELECT DISTINCT uuid FROM player_join_log WHERE time BETWEEN ? AND ?);", (statement) -> {
                     statement.setDate(1, sqlDate);
                     statement.setDate(2, sqlDateTo);
@@ -170,6 +170,6 @@ public void run(CommandEvent event) {
     }
     
     private String format(Rank rank) {
-        return rank.getRankEmote().getAsMention() + " ";
+        return rank.getRankEmote().getFormatted() + " ";
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/JoinsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinsCommand.java
similarity index 86%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/JoinsCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinsCommand.java
index 983c5b53..21aa02d3 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/JoinsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinsCommand.java
@@ -1,48 +1,48 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
-
-import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
-import com.diamondfire.helpbot.bot.command.help.*;
-import com.diamondfire.helpbot.bot.command.impl.Command;
-import com.diamondfire.helpbot.bot.command.permissions.Permission;
-import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
-import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
-import com.diamondfire.helpbot.util.FormatUtil;
-import net.dv8tion.jda.api.EmbedBuilder;
-
-public class JoinsCommand extends Command {
-    
-    @Override
-    public String getName() { return "joins"; }
-    
-    @Override
-    public HelpContext getHelpContext() {
-        return new HelpContext()
-                .description("Shows the total amount of unique players that have joined DiamondFire before.")
-                .category(CommandCategory.GENERAL_STATS);
-    }
-    
-    @Override
-    public ArgumentSet compileArguments() { return new ArgumentSet(); }
-    
-    @Override
-    public Permission getPermission() { return Permission.USER; }
-    
-    @Override
-    public void run(CommandEvent event) {
-        EmbedBuilder builder = new EmbedBuilder();
-        
-        builder.setTitle("Total Joins");
-        
-        // gets the total amount of players that have joined before
-        new DatabaseQuery()
-                .query(new BasicQuery("SELECT COUNT(*) AS count FROM players"))
-                .compile()
-                .run((result) -> {
-                    String count = FormatUtil.formatNumber(result.getResult().getInt("count"));
-                    builder.setDescription(String.format("A total of %s players have joined DiamondFire before!", count));
-                });
-        
-        event.getChannel().sendMessage(builder.build()).queue();
-    }
-}
+package com.diamondfire.helpbot.bot.command.impl.stats.metrics;
+
+import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
+import com.diamondfire.helpbot.bot.command.help.*;
+import com.diamondfire.helpbot.bot.command.impl.Command;
+import com.diamondfire.helpbot.bot.command.permissions.Permission;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
+import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
+import com.diamondfire.helpbot.util.FormatUtil;
+import net.dv8tion.jda.api.EmbedBuilder;
+
+public class JoinsCommand extends Command {
+    
+    @Override
+    public String getName() { return "joins"; }
+    
+    @Override
+    public HelpContext getHelpContext() {
+        return new HelpContext()
+                .description("Shows the total amount of unique players that have joined DiamondFire before.")
+                .category(CommandCategory.GENERAL_STATS);
+    }
+    
+    @Override
+    public ArgumentSet compileArguments() { return new ArgumentSet(); }
+    
+    @Override
+    public Permission getPermission() { return Permission.USER; }
+    
+    @Override
+    public void run(CommandEvent event) {
+        EmbedBuilder builder = new EmbedBuilder();
+        
+        builder.setTitle("Total Joins");
+        
+        // gets the total amount of players that have joined before
+        new DatabaseQuery()
+                .query(new BasicQuery("SELECT COUNT(uuid) AS count FROM ranks"))
+                .compile()
+                .run((result) -> {
+                    String count = FormatUtil.formatNumber(result.getResult().getInt("count"));
+                    builder.setDescription(String.format("A total of %s players have joined DiamondFire before!", count));
+                });
+        
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/NewPlayersCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/NewPlayersCommand.java
similarity index 82%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/NewPlayersCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/NewPlayersCommand.java
index 97185434..f221c26a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/NewPlayersCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/NewPlayersCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.metrics;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -46,13 +46,12 @@ public void run(CommandEvent event) {
                 );
         EmbedBuilder embed = preset.getEmbed();
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT players.name, approved_users.time FROM approved_users " +
-                        "LEFT JOIN players ON approved_users.uuid = players.uuid " +
-                        "WHERE time > CURRENT_TIMESTAMP() - INTERVAL 1 DAY ORDER BY time DESC LIMIT 20"))
+                .query(new BasicQuery("SELECT name, join_date FROM players " +
+                        "WHERE join_date > CURRENT_TIMESTAMP() - INTERVAL 1 DAY ORDER BY join_date DESC LIMIT 20"))
                 .compile()
                 .run((result) -> {
                     for (ResultSet set : result) {
-                        embed.addField(StringUtil.display(set.getString("name")), set.getTimestamp("time").toString(), false);
+                        embed.addField(StringUtil.display(set.getString("name")), set.getTimestamp("join_date").toString(), false);
                     }
                 });
         
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/PlayersCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/PlayersCommand.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/PlayersCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/PlayersCommand.java
index bc4e3bb4..02ef9dfc 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/PlayersCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/PlayersCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.metrics;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/AbstractPlotCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/AbstractPlotCommand.java
index 3122439c..cf27799b 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/AbstractPlotCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/AbstractPlotCommand.java
@@ -6,6 +6,8 @@
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.utils.FileUpload;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.sql.*;
@@ -38,27 +40,31 @@ public abstract class AbstractPlotCommand extends Command {
     public void run(CommandEvent event) {
         PresetBuilder preset = new PresetBuilder();
         try {
-            ResultSet resultTablePlot = getPlot(event);
+            Plot plot = getPlot(event);
             EmbedBuilder embed = preset.getEmbed();
             
-            if (resultTablePlot == null || !resultTablePlot.next()) {
+            if (plot == null) {
                 throw new IllegalStateException("Plot not found");
             }
-            int plotID = resultTablePlot.getInt("id");
+            int plotID = plot.id();
             preset.withPreset(
                     new InformativeReply(InformativeReplyType.INFO, String.format("Plot Information (%s)", plotID), null)
             );
             
-            PlotSize size = PlotSize.fromID(resultTablePlot.getInt("plotsize") - 1);
+            @Nullable String handle = plot.handle();
+            @Nullable String description = plot.description();
+            PlotSize size = plot.plotSize();
             
-            embed.setTitle(String.format("Plot Information (%s)", plotID));
-            embed.addField("Name", StringUtil.display(resultTablePlot.getString("name")), true);
-            embed.addField("Owner", resultTablePlot.getString("owner_name"), true);
-            embed.addField("Node", "Node " + resultTablePlot.getInt("node"), true);
+            embed.setTitle(handle == null ? String.format("Plot Information (%s)", plotID) : String.format("Plot Information (%s) (%s)", handle, plotID));
+            embed.setDescription(description);
+            embed.addField("Name", StringUtil.fromMiniMessage(plot.name()), true);
+            embed.addField("Owner", plot.ownerName(), true);
+            boolean privateNode = plot.node() >= 1000;
+            embed.addField("Node", (privateNode ? "Private " : "") + "Node " + (privateNode ? plot.node() - 1000 : plot.node()), true);
             embed.addField("Plot Size", StringUtil.smartCaps(size.name()), true);
             
             // Creates a list of tags that the plot has
-            String tags = resultTablePlot.getString("tags");
+            String tags = plot.tags();
             if (tags.equals("none")) {
                 embed.addField("Plot Tags", "None", true);
             } else {
@@ -69,22 +75,19 @@ public void run(CommandEvent event) {
                 embed.addField("Plot Tags", StringUtil.listView("> ", true, tagList.toArray(new String[0])), true);
             }
             
-            int weeksTillClear = resultTablePlot.getInt("immunity_level");
-            LocalDate activeTime = resultTablePlot.getDate("active_time").toLocalDate();
-            LocalDate clearDate = activeTime.plus(weeksTillClear, ChronoUnit.WEEKS);
+            LocalDate activeTime = plot.activeTime();
             
-            embed.addField("Auto Clear Date", FormatUtil.formatDate(clearDate) + String.format(" (%s weeks)", ChronoUnit.WEEKS.between(activeTime, clearDate)), true);
             embed.addField("Last Active Date", FormatUtil.formatDate(activeTime), true);
-            embed.addField("Whitelisted", (resultTablePlot.getInt("whitelist") == 1) + "", true);
-            embed.addField("Player Count", FormatUtil.formatNumber(resultTablePlot.getInt("player_count")), true);
-            embed.addField("Current Votes", FormatUtil.formatNumber(resultTablePlot.getInt("votes")), true);
+            embed.addField("Whitelisted", plot.whitelisted() + "", true);
+            embed.addField("Player Count", FormatUtil.formatNumber(plot.playerCount()), true);
+            embed.addField("Current Votes", FormatUtil.formatNumber(plot.votes()), true);
             
-            int x = resultTablePlot.getInt("xmin") + (size.getSize() / 2);
-            int z = resultTablePlot.getInt("zmin") + (size.getSize() / 2);
+            int x = plot.xMin() + (size.getSize() / 2);
+            int z = plot.zMin() + (size.getSize() / 2);
             embed.addField("Plot Center", String.format("[%s, 50, %s]", x, z), true);
             
             // Creates the icon for the plot
-            String plotIcon = resultTablePlot.getString("icon");
+            String plotIcon = plot.icon();
             // Plot head icons start with the character h.
             if (plotIcon.startsWith("h")) {
                 embed.setThumbnail(Util.getPlayerHead(plotIcon.substring(1)));
@@ -92,10 +95,10 @@ public void run(CommandEvent event) {
             } else {
                 File mcItem = Util.fetchMinecraftTextureFile(plotIcon.toUpperCase());
                 embed.setThumbnail("attachment://" + mcItem.getName());
-                event.getReplyHandler().replyA(preset).addFile(mcItem).queue();
+                event.getReplyHandler().replyA(preset).addFiles(FileUpload.fromData(mcItem)).queue();
             }
             
-        } catch (SQLException | IllegalStateException e) {
+        } catch (IllegalStateException e) {
             preset.withPreset(
                     new InformativeReply(InformativeReplyType.ERROR, "Plot was not found.")
             );
@@ -103,26 +106,27 @@ public void run(CommandEvent event) {
         }
     }
     
-    public abstract ResultSet getPlot(CommandEvent event);
+    public abstract @Nullable Plot getPlot(CommandEvent event);
     
-    
-    private enum PlotSize {
-        BASIC(51),
-        LARGE(101),
-        MASSIVE(301);
-        
-        private final int size;
-        
-        PlotSize(int size) {
-            this.size = size;
-        }
-        
-        public int getSize() {
-            return size;
-        }
-        
-        public static PlotSize fromID(int id) {
-            return PlotSize.values()[id];
-        }
+    protected Plot mapResultSetToPlot(final ResultSet rs) throws SQLException {
+        return new Plot(
+                rs.getInt("id"),
+                rs.getString("handle"),
+                rs.getString("description"),
+                rs.getString("name"),
+                rs.getString("owner_name"),
+                rs.getInt("node"),
+                PlotSize.fromID(rs.getInt("plotsize") - 1),
+                rs.getString("tags"),
+                rs.getInt("immunity_level"),
+                rs.getDate("active_time").toLocalDate(),
+                rs.getInt("whitelist") == 1,
+                rs.getInt("player_count"),
+                rs.getInt("votes"),
+                rs.getInt("xmin"),
+                rs.getInt("zmin"),
+                rs.getString("icon")
+        );
     }
+
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/Plot.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/Plot.java
new file mode 100644
index 00000000..eb1534f3
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/Plot.java
@@ -0,0 +1,9 @@
+package com.diamondfire.helpbot.bot.command.impl.stats.plot;
+
+import java.time.LocalDate;
+
+public record Plot(int id, String handle, String description, String name, String ownerName, int node,
+                   PlotSize plotSize, String tags, int immunityLevel, LocalDate activeTime, boolean whitelisted,
+                   int playerCount, int votes, int xMin, int zMin, String icon) {
+    
+}
\ No newline at end of file
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotCommand.java
index d9bbe6c9..eff77ec8 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotCommand.java
@@ -1,7 +1,7 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.plot;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
-import com.diamondfire.helpbot.bot.command.argument.impl.types.IntegerArgument;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.*;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
@@ -23,15 +23,15 @@ public HelpContext getHelpContext() {
                 .category(CommandCategory.GENERAL_STATS)
                 .addArgument(
                         new HelpContextArgument()
-                                .name("plot id")
+                                .name("plot id or handle")
                 );
     }
     
     @Override
     public ArgumentSet compileArguments() {
         return new ArgumentSet()
-                .addArgument("id",
-                        new IntegerArgument());
+                .addArgument("id_or_handle",
+                        new StringArgument());
     }
     
     @Override
@@ -40,14 +40,34 @@ public Permission getPermission() {
     }
     
     @Override
-    public ResultSet getPlot(CommandEvent event) {
+    public Plot getPlot(final CommandEvent event) {
         try {
-            Connection connection = ConnectionProvider.getConnection();
-            PreparedStatement statement = connection.prepareStatement("SELECT * FROM plots WHERE id = ?");
-            statement.setInt(1, event.getArgument("id"));
-            
-            return statement.executeQuery();
-        } catch (Exception e) {
+            int id = Integer.parseInt(event.getArgument("id_or_handle"));
+            try (Connection connection = ConnectionProvider.getConnection();
+                 PreparedStatement statement = connection.prepareStatement("SELECT * FROM plots WHERE id = ?")) {
+                
+                statement.setInt(1, id);
+                try (ResultSet resultSet = statement.executeQuery()) {
+                    if (resultSet.next()) {
+                        return this.mapResultSetToPlot(resultSet);
+                    }
+                }
+            }
+        } catch (NumberFormatException ignored) {
+            String handle = event.getArgument("id_or_handle");
+            try (Connection connection = ConnectionProvider.getConnection();
+                 PreparedStatement statement = connection.prepareStatement("SELECT * FROM plots WHERE handle = ?")) {
+                
+                statement.setString(1, handle);
+                try (ResultSet resultSet = statement.executeQuery()) {
+                    if (resultSet.next()) {
+                        return this.mapResultSetToPlot(resultSet);
+                    }
+                }
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        } catch (SQLException e) {
             e.printStackTrace();
         }
         return null;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotLocCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotLocCommand.java
index ee94dcf8..b36e8943 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotLocCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotLocCommand.java
@@ -41,7 +41,7 @@ public ArgumentSet compileArguments() {
                 .addArgument("z",
                         new IntegerArgument())
                 .addArgument("node",
-                        new SingleArgumentContainer<>(new DefinedObjectArgument<>(1, 2, 3, 4, 5)).optional(null));
+                        new SingleArgumentContainer<>(new DefinedObjectArgument<>(1, 2, 3, 4, 5, 6, 7)).optional(null));
     }
     
     @Override
@@ -51,7 +51,7 @@ public Permission getPermission() {
     
     // If someone who knows MYSQL enough that they can add plotsize as some sort of "local" variable. Go for it.
     @Override
-    public ResultSet getPlot(CommandEvent event) {
+    public Plot getPlot(CommandEvent event) {
         try {
             Connection connection = ConnectionProvider.getConnection();
             boolean nodeSpecific = event.getArgument("node") != null;
@@ -80,7 +80,7 @@ public ResultSet getPlot(CommandEvent event) {
             
             statement.setInt(1, event.getArgument("x"));
             statement.setInt(2, event.getArgument("z"));
-            return statement.executeQuery();
+            return this.mapResultSetToPlot(statement.executeQuery());
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotSize.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotSize.java
new file mode 100644
index 00000000..2d684437
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotSize.java
@@ -0,0 +1,22 @@
+package com.diamondfire.helpbot.bot.command.impl.stats.plot;
+
+enum PlotSize {
+    BASIC(51),
+    LARGE(101),
+    MASSIVE(301),
+    MEGA(1001);
+    
+    private final int size;
+    
+    PlotSize(int size) {
+        this.size = size;
+    }
+    
+    public static PlotSize fromID(int id) {
+        return PlotSize.values()[id];
+    }
+    
+    public int getSize() {
+        return size;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotVoteGraphCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotVoteGraphCommand.java
index 05f85ffb..6431a8a8 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotVoteGraphCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/PlotVoteGraphCommand.java
@@ -12,6 +12,7 @@
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.graph.graphable.*;
 import com.diamondfire.helpbot.sys.graph.impl.ChartGraphBuilder;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.sql.ResultSet;
 import java.util.*;
@@ -70,9 +71,9 @@ public void run(CommandEvent event) {
                         entries.add(new StringEntry(set.getString("time")));
                     }
                     
-                    event.getChannel().sendFile(new ChartGraphBuilder()
+                    event.getChannel().sendFiles(FileUpload.fromData(new ChartGraphBuilder()
                             .setGraphName(String.format("Votes on plot %s this month", plotID))
-                            .createGraphFromCollection(entries)).queue();
+                            .createGraphFromCollection(entries))).queue();
                 });
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/AbstractSessionLogCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/AbstractSessionLogCommand.java
index e91555ea..7e9e14c4 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/AbstractSessionLogCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/AbstractSessionLogCommand.java
@@ -1,10 +1,12 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.support;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import com.diamondfire.helpbot.sys.externalfile.ExternalFileUtil;
 import com.diamondfire.helpbot.util.FormatUtil;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.io.File;
 import java.nio.file.*;
@@ -20,8 +22,8 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
-        List<Session> sessions = getSessions(player);
+    protected void execute(CommandEvent event, Player player) {
+        List<Session> sessions = getSessions(player.name());
         StringBuilder builder = new StringBuilder();
         
         for (Session session : sessions) {
@@ -36,7 +38,7 @@ protected void execute(CommandEvent event, String player) {
             File file = ExternalFileUtil.generateFile("session_log.txt");
             Files.writeString(file.toPath(), builder.toString(), StandardOpenOption.WRITE);
             
-            event.getChannel().sendFile(file).queue();
+            event.getChannel().sendFiles(FileUpload.fromData(file)).queue();
         } catch (Exception e) {
             throw new IllegalStateException();
         }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/DailySessionsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/DailySessionsCommand.java
index b5517384..57311236 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/DailySessionsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/DailySessionsCommand.java
@@ -12,6 +12,7 @@
 import com.diamondfire.helpbot.sys.graph.graphable.*;
 import com.diamondfire.helpbot.sys.graph.impl.ChartGraphBuilder;
 import com.diamondfire.helpbot.util.DateUtil;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.sql.ResultSet;
 import java.time.Instant;
@@ -100,9 +101,9 @@ public void run(CommandEvent event) {
                         }
                     }
                     
-                    event.getChannel().sendFile(new ChartGraphBuilder()
+                    event.getChannel().sendFiles(FileUpload.fromData(new ChartGraphBuilder()
                             .setGraphName(String.format("Total sessions on %s", date))
-                            .createGraph(dates)).queue();
+                            .createGraph(dates))).queue();
                     
                 });
         
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java
index 3ff89fc4..4412f595 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java
@@ -37,7 +37,7 @@ public ArgumentSet compileArguments() {
     
     @Override
     public Permission getPermission() {
-        return Permission.EXPERT;
+        return Permission.SR_HELPER;
     }
     
     @Override
@@ -62,7 +62,7 @@ public void run(CommandEvent event) {
                         "FROM owen.excused_staff " +
                         "LEFT JOIN ranks r ON excused_staff.uuid = r.uuid " +
                         "LEFT JOIN players p ON excused_staff.uuid = p.uuid " +
-                        "WHERE (support > 0 || moderation > 0) AND (excused_till > CURRENT_TIMESTAMP() || !handled) " +
+                        "WHERE (support > 0 || moderation > 0) AND (!handled) " +
                         "ORDER BY excused_till DESC;"))
                 .compile()
                 .run((result) -> {
@@ -83,7 +83,7 @@ public void run(CommandEvent event) {
                             names.add(name);
                         }
                         
-                        embed.addField(rank.getRankEmote().getAsMention() + " " + name, String.format("Until: ``%s``\nReason: %s (<@%s>)", FormatUtil.formatDate(date), reason, excused_by), false);
+                        embed.addField(rank.getRankEmote().getFormatted() + " " + name, String.format("Until: ``%s``\nReason: %s (<@%s>)", FormatUtil.formatDate(date), reason, excused_by), false);
                     }
                     
                     event.reply(builder);
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/FindSupporteeNamesCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/FindSupporteeNamesCommand.java
index 64302441..fe316f24 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/FindSupporteeNamesCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/FindSupporteeNamesCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.support;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -38,8 +39,8 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
-        JsonObject profile = Util.getPlayerProfile(player);
+    protected void execute(CommandEvent event, Player player) {
+        JsonObject profile = Util.getPlayerProfile(player.name());
         PresetBuilder builder = new PresetBuilder();
         List<NameDateRange> nameRanges = new ArrayList<>();
         Set<String> names = new HashSet<>();
@@ -130,7 +131,7 @@ protected void execute(CommandEvent event, String player) {
                 builder.getEmbed().addField("", "Player hasn't been helped by anybody!", false);
             }
             
-            msg.editMessage(builder.getEmbed().build()).override(true).queue();
+            msg.editMessageEmbeds(builder.getEmbed().build()).setReplace(true).queue();
         });
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/HelpedByCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/HelpedByCommand.java
index 3d811159..07546313 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/HelpedByCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/HelpedByCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.support;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -41,12 +42,12 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder();
         EmbedBuilder embed = preset.getEmbed();
         
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT COUNT(name) AS total, name,staff FROM support_sessions WHERE staff = ? GROUP BY name ORDER BY count(name) DESC LIMIT 25;", (statement) -> statement.setString(1, player)))
+                .query(new BasicQuery("SELECT COUNT(name) AS total, name,staff FROM support_sessions WHERE staff = ? GROUP BY name ORDER BY count(name) DESC LIMIT 25;", (statement) -> statement.setString(1, player.name())))
                 .compile()
                 .run((result) -> {
                     if (result.isEmpty()) {
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java
index f020e4fb..7b0da837 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java
@@ -47,7 +47,7 @@ public ArgumentSet compileArguments() {
     
     @Override
     public Permission getPermission() {
-        return Permission.EXPERT;
+        return Permission.SR_HELPER;
     }
     
     @Override
@@ -68,7 +68,7 @@ public void run(CommandEvent event) {
                         "      FROM ranks," +
                         "           players" +
                         "      WHERE ranks.uuid = players.uuid" +
-                        "        AND players.uuid NOT IN (SELECT DISTINCT uuid FROM owen.excused_staff WHERE excused_till > CURRENT_TIMESTAMP())" +
+                        "        AND players.uuid NOT IN (SELECT DISTINCT uuid FROM owen.excused_staff WHERE handled = false)" +
                         "        AND ranks.administration = 0" +
                         "        AND ranks.support > 0 | ranks.moderation > 0) p" +
                         "         LEFT JOIN (SELECT uuid, MAX(time) AS latest FROM player_join_log GROUP BY uuid) cn" +
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/QueueCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/QueueCommand.java
similarity index 89%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/QueueCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/QueueCommand.java
index 7bf64c57..cf8dbed0 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/QueueCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/QueueCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.support;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -13,6 +13,7 @@
 
 import java.awt.*;
 import java.sql.ResultSet;
+import java.time.Instant;
 
 public class QueueCommand extends Command {
     
@@ -49,7 +50,7 @@ public void run(CommandEvent event) {
         EmbedBuilder embed = preset.getEmbed();
         
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT player, plot, node, staff, TIMEDIFF(CURRENT_TIMESTAMP(), enter_time) AS time FROM support_queue ORDER BY enter_time LIMIT 25;"))
+                .query(new BasicQuery("SELECT player, plot, node, staff, TIME_TO_SEC(TIMEDIFF(CURRENT_TIMESTAMP(), enter_time)) AS time FROM support_queue ORDER BY enter_time LIMIT 25"))
                 .compile()
                 .run((result) -> {
                     if (result.isEmpty()) {
@@ -61,7 +62,7 @@ public void run(CommandEvent event) {
                     
                     int i = 0;
                     for (ResultSet set : result) {
-                        embed.addField(StringUtil.display(set.getString("player")), FormatUtil.formatMilliTime(set.getTime("time").getTime()), false);
+                        embed.addField(StringUtil.display(set.getString("player")), FormatUtil.formatMilliTime(Instant.EPOCH.plusSeconds(set.getInt("time")).toEpochMilli()), false);
                         i++;
                     }
                     embed.setTitle(String.format("Players in Queue (%s)", i));
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SessionsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SessionsCommand.java
index b5781ca4..0e76bf03 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SessionsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SessionsCommand.java
@@ -27,7 +27,7 @@ public HelpContext getHelpContext() {
     }
     
     @Override
-    protected List<AbstractSessionLogCommand.Session> getSessions(String player) {
+    protected List<Session> getSessions(String player) {
         List<Session> sessions = new ArrayList<>();
         new DatabaseQuery()
                 .query(new BasicQuery("SELECT * FROM support_sessions WHERE staff = ? ORDER BY time", (statement) -> statement.setString(1, player)))
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsCommand.java
index 470dffcf..d17a72fd 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsCommand.java
@@ -3,6 +3,7 @@
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
 import com.diamondfire.helpbot.bot.command.argument.impl.types.TimeOffsetArgument;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -53,10 +54,11 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
-                        new InformativeReply(InformativeReplyType.INFO, "Support Stats", null)
+                        new InformativeReply(InformativeReplyType.INFO, "Support Stats", null),
+                        new MinecraftUserPreset(player)
                 );
         EmbedBuilder embed = preset.getEmbed();
         
@@ -67,7 +69,7 @@ protected void execute(CommandEvent event, String player) {
                         "MAX(time) AS latest_time," +
                         "COUNT(DISTINCT name) AS unique_helped, staff FROM support_sessions WHERE staff = ? AND (time > ? OR ?);",
                         (statement) -> {
-                            statement.setString(1, player);
+                            statement.setString(1, player.name());
                             
                             java.util.Date date = event.getArgument("timeframe");
                             Timestamp sqlTimestamp = null;
@@ -87,17 +89,12 @@ protected void execute(CommandEvent event, String player) {
                         return;
                     }
                     
-                    String formattedName = set.getString("staff");
-                    preset.withPreset(
-                            new MinecraftUserPreset(formattedName)
-                    );
-                    
                     new DatabaseQuery()
                             .query(new BasicQuery("SELECT COUNT(*) AS count, SUM(duration) AS total_time, " +
                                     "? IN (SELECT players.name FROM ranks, players WHERE ranks.uuid = players.uuid AND ranks.support >= 1 AND ranks.moderation = 0 AND ranks.administration = 0) AS support," +
                                     "(COUNT(*) < 5) AS bad FROM support_sessions WHERE staff = ? AND time > CURRENT_TIMESTAMP() - INTERVAL 30 DAY;", (statement) -> {
-                                statement.setString(1, player);
-                                statement.setString(2, player);
+                                statement.setString(1, player.name());
+                                statement.setString(2, player.name());
                             }))
                             .compile()
                             .run((resultBadTable) -> {
@@ -108,7 +105,7 @@ protected void execute(CommandEvent event, String player) {
                                     new DatabaseQuery()
                                             .query(new BasicQuery("SELECT (time + INTERVAL 30 DAY) AS bad_time " +
                                                     "FROM support_sessions WHERE staff = ?" +
-                                                    "ORDER BY TIME DESC LIMIT 1 OFFSET 4;", (statement) -> statement.setString(1, player)))
+                                                    "ORDER BY TIME DESC LIMIT 1 OFFSET 4;", (statement) -> statement.setString(1, player.name())))
                                             .compile()
                                             .run((resultBad) -> {
                                                 if (resultBad.isEmpty()) {
@@ -135,7 +132,7 @@ protected void execute(CommandEvent event, String player) {
                             .query(new BasicQuery("SELECT AVG(duration) AS average_duration," +
                                     "MIN(duration) AS shortest_duration," +
                                     "MAX(duration) AS longest_duration " +
-                                    "FROM support_sessions WHERE duration != 0 AND staff = ?;", (statement) -> statement.setString(1, player)))
+                                    "FROM support_sessions WHERE duration != 0 AND staff = ?;", (statement) -> statement.setString(1, player.name())))
                             .compile()
                             .run((resultTableTime) -> {
                                 ResultSet timeSet = resultTableTime.getResult();
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsGraphCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsGraphCommand.java
index 3296b356..882bb556 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsGraphCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/StatsGraphCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.support;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -8,6 +9,7 @@
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.graph.graphable.*;
 import com.diamondfire.helpbot.sys.graph.impl.ChartGraphBuilder;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 import java.sql.ResultSet;
 import java.util.*;
@@ -43,17 +45,18 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         new DatabaseQuery()
-                .query(new BasicQuery("WITH RECURSIVE all_dates(dt) AS (\n" +
-                        "    SELECT (SELECT DATE(time) FROM support_sessions WHERE staff = ? ORDER BY time LIMIT 1) dt\n" +
-                        "        UNION ALL\n" +
-                        "    SELECT dt + INTERVAl 1 DAY FROM all_dates WHERE dt + INTERVAL 1 DAY <= CURRENT_TIMESTAMP()\n" +
-                        ")\n" +
-                        "SELECT dates.dt date, COALESCE(t.total, 0) AS total FROM all_dates dates LEFT JOIN (SELECT DATE(time) AS date, COUNT(time) AS total FROM support_sessions WHERE staff = ? GROUP BY DATE(time)) t ON t.date = dates.dt ORDER BY dates.dt",
+                .query(new BasicQuery("""
+                        WITH RECURSIVE all_dates(dt) AS (
+                            SELECT (SELECT DATE(time) FROM support_sessions WHERE staff = ? ORDER BY time LIMIT 1) dt
+                                UNION ALL
+                            SELECT dt + INTERVAl 1 DAY FROM all_dates WHERE dt + INTERVAL 1 DAY <= CURRENT_TIMESTAMP()
+                        )
+                        SELECT dates.dt date, COALESCE(t.total, 0) AS total FROM all_dates dates LEFT JOIN (SELECT DATE(time) AS date, COUNT(time) AS total FROM support_sessions WHERE staff = ? GROUP BY DATE(time)) t ON t.date = dates.dt ORDER BY dates.dt""",
                         (statement) -> {
-                            statement.setString(1, player);
-                            statement.setString(2, player);
+                            statement.setString(1, player.name());
+                            statement.setString(2, player.name());
                         }))
                 .compile()
                 .run((query) -> {
@@ -61,13 +64,12 @@ protected void execute(CommandEvent event, String player) {
                     for (ResultSet set : query) {
                         dates.put(new DateEntry(set.getDate("date")), set.getInt("total"));
                     }
-                    
-                    event.getChannel().sendFile(new ChartGraphBuilder()
+                
+                    event.getChannel().sendFiles(FileUpload.fromData(new ChartGraphBuilder()
                             .setGraphName(String.format("%s's sessions", player))
-                            .createGraph(dates)).queue();
-                    
+                            .createGraph(dates))).queue();
+                
                 });
-        
     }
     
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBadCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBadCommand.java
index b8ad2cde..2bd1b2ac 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBadCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBadCommand.java
@@ -78,7 +78,7 @@ public void run(CommandEvent event) {
                         "        AND ranks.support >= 1" +
                         "        AND ranks.moderation = 0" +
                         "        AND ranks.administration = 0" +
-                        "        AND players.uuid NOT IN (SELECT DISTINCT uuid FROM owen.excused_staff WHERE excused_till > CURRENT_TIMESTAMP())) p" +
+                        "        AND players.uuid NOT IN (SELECT DISTINCT uuid FROM owen.excused_staff WHERE handled = false)) p" +
                         "         LEFT OUTER JOIN (SELECT DISTINCT staff AS name, COUNT(staff) AS count" +
                         "                          FROM support_sessions" +
                         "                          WHERE time > CURRENT_TIMESTAMP() - INTERVAL ? DAY" +
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java
index 9b32e30e..092445c0 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java
@@ -35,7 +35,7 @@ public ArgumentSet compileArguments() {
     
     @Override
     public Permission getPermission() {
-        return Permission.EXPERT;
+        return Permission.SR_HELPER;
     }
     
     @Override
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupporteeStatsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupporteeStatsCommand.java
index 9be2cbe6..c564a846 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupporteeStatsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupporteeStatsCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.support;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -44,19 +45,20 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
-                        new InformativeReply(InformativeReplyType.INFO, "Session Stats", null)
+                        new InformativeReply(InformativeReplyType.INFO, "Session Stats", null),
+                        new MinecraftUserPreset(player)
                 );
         EmbedBuilder embed = preset.getEmbed();
-        
+    
         new DatabaseQuery()
                 .query(new BasicQuery("SELECT COUNT(*) AS count," +
                         "SUM(duration) AS total_duration," +
                         "MIN(time) AS earliest_time," +
                         "MAX(time) AS latest_time," +
-                        "COUNT(DISTINCT staff) AS unique_helped, name FROM support_sessions WHERE name = ?;", (statement) -> statement.setString(1, player)))
+                        "COUNT(DISTINCT staff) AS unique_helped, name FROM support_sessions WHERE name = ?;", (statement) -> statement.setString(1, player.name())))
                 .compile()
                 .run((result) -> {
                     ResultSet set = result.getResult();
@@ -65,28 +67,24 @@ protected void execute(CommandEvent event, String player) {
                         preset.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Player has not been in a session!"));
                         return;
                     }
-                    String formattedName = set.getString("name");
-                    preset.withPreset(
-                            new MinecraftUserPreset(formattedName)
-                    );
                     
                     new DatabaseQuery()
                             .query(new BasicQuery("SELECT COUNT(*) AS count FROM support_sessions " +
-                                    "WHERE name = ? AND time > CURRENT_TIMESTAMP() - INTERVAL 30 DAY;", (statement) -> statement.setString(1, player)))
+                                    "WHERE name = ? AND time > CURRENT_TIMESTAMP() - INTERVAL 30 DAY;", (statement) -> statement.setString(1, player.name())))
                             .compile()
                             .run((resultBadTable) -> embed.addField("Sessions this month:", resultBadTable.getResult().getInt("count") + "", true));
-                    
+                
                     embed.addField("Total Sessions", set.getInt("count") + "", true);
                     embed.addField("Unique Support Members", set.getInt("unique_helped") + "", true);
                     embed.addField("Total Session Time", FormatUtil.formatMilliTime(set.getLong("total_duration")), true);
                     embed.addField("Earliest Session", FormatUtil.formatDate(set.getDate("earliest_time")), true);
                     embed.addField("Latest Session", FormatUtil.formatDate(set.getDate("latest_time")), true);
-                    
+                
                     new DatabaseQuery()
                             .query(new BasicQuery("SELECT AVG(duration) AS average_duration," +
                                     "MIN(duration) AS shortest_duration," +
                                     "MAX(duration) AS longest_duration " +
-                                    "FROM support_sessions WHERE duration != 0 AND name = ?;", (statement) -> statement.setString(1, player)))
+                                    "FROM support_sessions WHERE duration != 0 AND name = ?;", (statement) -> statement.setString(1, player.name())))
                             .compile()
                             .run((timeResult) -> {
                                 ResultSet timeSet = timeResult.getResult();
@@ -94,9 +92,9 @@ protected void execute(CommandEvent event, String player) {
                                 embed.addField("Shortest Session Time", FormatUtil.formatMilliTime(timeSet.getLong("shortest_duration")), true);
                                 embed.addField("Longest Session Time", FormatUtil.formatMilliTime(timeSet.getLong("longest_duration")), true);
                             });
-                    
+                
                 });
-        
+    
         event.reply(preset);
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/TotalStatsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/TotalStatsCommand.java
index 9cbe1785..a7222f0e 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/TotalStatsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/TotalStatsCommand.java
@@ -137,7 +137,7 @@ public void run(CommandEvent event) {
                         
                     });
             
-            msg.editMessage(embed.build()).queue();
+            msg.editMessageEmbeds(embed.build()).queue();
         });
         
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/WhoHelpedCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/WhoHelpedCommand.java
index c473da5c..fe239d6a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/WhoHelpedCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/WhoHelpedCommand.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.impl.stats.support;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.bot.command.help.*;
 import com.diamondfire.helpbot.bot.command.impl.stats.AbstractPlayerUUIDCommand;
 import com.diamondfire.helpbot.bot.command.permissions.Permission;
@@ -41,24 +42,24 @@ public Permission getPermission() {
     }
     
     @Override
-    protected void execute(CommandEvent event, String player) {
+    protected void execute(CommandEvent event, Player player) {
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
                         new MinecraftUserPreset(player),
                         new InformativeReply(InformativeReplyType.INFO, "Players who have helped " + player, null)
                 );
         EmbedBuilder embed = preset.getEmbed();
-        
+    
         new DatabaseQuery()
-                .query(new BasicQuery("SELECT COUNT(staff) AS total, staff,name FROM support_sessions WHERE name = ? GROUP BY staff ORDER BY count(staff) DESC;", (statement) -> statement.setString(1, player)))
+                .query(new BasicQuery("SELECT COUNT(staff) AS total, staff,name FROM support_sessions WHERE name = ? GROUP BY staff ORDER BY count(staff) DESC;", (statement) -> statement.setString(1, player.name())))
                 .compile()
                 .run((result) -> {
-                    
+                
                     if (result.isEmpty()) {
                         embed.setDescription("Nobody!");
                         return;
                     }
-                    
+                
                     ResultSet set = result.getResult();
                     List<String> sessions = new ArrayList<>();
                     String formattedName = set.getString("name");
@@ -66,13 +67,13 @@ protected void execute(CommandEvent event, String player) {
                             new MinecraftUserPreset(formattedName),
                             new InformativeReply(InformativeReplyType.INFO, "Players who have helped " + formattedName, null)
                     );
-                    
+                
                     for (ResultSet ignored : result) {
                         sessions.add(set.getInt("total") + " " + set.getString("staff"));
                     }
-                    
+                
                     EmbedUtil.addFields(embed, sessions, true);
-                    
+                
                 });
         event.reply(preset);
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/AbstractLeaderboardCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/AbstractLeaderboardCommand.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/AbstractLeaderboardCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/AbstractLeaderboardCommand.java
index 096c6486..9b1e7ee3 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/AbstractLeaderboardCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/AbstractLeaderboardCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.top;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/ActivePlotsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/ActivePlotsCommand.java
similarity index 93%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/ActivePlotsCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/ActivePlotsCommand.java
index 5ce3e26b..dd74fd4e 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/ActivePlotsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/ActivePlotsCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.top;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -55,7 +55,7 @@ public void run(CommandEvent event) {
                 .compile()
                 .run((result) -> {
                     for (ResultSet set : result) {
-                        embed.addField(StringUtil.display(set.getString("name")) +
+                        embed.addField(StringUtil.fromMiniMessage(set.getString("name")) +
                                         String.format(" **(%s)**", set.getInt("id")),
                                 "Players: " + set.getInt("player_count"), false);
                     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/CpTopCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/CpTopCommand.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/CpTopCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/CpTopCommand.java
index d869a9e0..818f992a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/CpTopCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/CpTopCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.top;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.types.SingleArgumentContainer;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/DiscordBoostersCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/DiscordBoostersCommand.java
similarity index 63%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/DiscordBoostersCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/DiscordBoostersCommand.java
index 9ab574a4..48374965 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/DiscordBoostersCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/DiscordBoostersCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.top;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -7,12 +7,15 @@
 import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
 import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
-import com.diamondfire.helpbot.util.StringUtil;
+import com.diamondfire.helpbot.util.DateUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.utils.TimeFormat;
 
 import java.awt.*;
-import java.util.Comparator;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.*;
 
 public class DiscordBoostersCommand extends Command {
     
@@ -48,22 +51,37 @@ public void run(CommandEvent event) {
         Guild guild = event.getGuild();
         PresetBuilder preset = new PresetBuilder()
                 .withPreset(
-                        new InformativeReply(InformativeReplyType.INFO, "Current Discord Boosters", null)
+                        new InformativeReply(InformativeReplyType.INFO, "Discord Server Boosters", null)
                 );
         EmbedBuilder embed = preset.getEmbed();
         embed.setThumbnail("https://cdn.discordapp.com/emojis/699936318398136341.png?v=1");
         
         event.getGuild().findMembers((member -> member.getTimeBoosted() != null)).onSuccess((members) -> {
-            embed.setDescription(StringUtil.listView("> ", true, members.stream()
-                    .sorted(Comparator.comparing(Member::getTimeBoosted))
-                    .map(Member::getEffectiveName)
-                    .toArray(String[]::new)));
+            members.sort(Comparator.comparing(Member::getTimeBoosted));
+            embed.setDescription("A list of members that are currently boosting this Discord server.\n\n"+
+                    getFormattedBoosters(members));
             embed.setColor(new Color(255, 115, 250));
             event.reply(preset);
             guild.pruneMemberCache();
         });
     }
     
+    private static String getFormattedBoosters(List<Member> members) {
+        if (members.size() == 0) return "*None*";
+        
+        else {
+            SimpleDateFormat format = new SimpleDateFormat("y'y'M'm'D'd'");
+    
+            List<String> elements = new ArrayList<>();
+            for (Member member : members) {
+                String timeBoosted = format.format(DateUtil.toDate(member.getTimeBoosted().toInstant().toEpochMilli()));
+                elements.add(member.getAsMention() + " - " + timeBoosted);
+            }
+    
+            return String.join("\n", elements);
+        }
+    }
+    
 }
 
 
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/TokenTopCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/TokenTopCommand.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/TokenTopCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/TokenTopCommand.java
index d13ca3d9..daaeb3ae 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/TokenTopCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/TokenTopCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.top;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/TrendingPlotsCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/TrendingPlotsCommand.java
similarity index 94%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/TrendingPlotsCommand.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/TrendingPlotsCommand.java
index 5fe26fe9..7f9cfa25 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/TrendingPlotsCommand.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/TrendingPlotsCommand.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.top;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
@@ -59,7 +59,7 @@ public void run(CommandEvent event) {
                             stats.add("Players: " + count);
                         }
                         
-                        embed.addField(StringUtil.display(set.getString("name")) +
+                        embed.addField(StringUtil.fromMiniMessage(set.getString("name")) +
                                         String.format(" **(%s)**", set.getInt("id")),
                                 String.join("\n", stats), false);
                     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/VoteGivenLeaderboard.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/VoteGivenLeaderboard.java
similarity index 97%
rename from src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/VoteGivenLeaderboard.java
rename to src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/VoteGivenLeaderboard.java
index a1a141bb..fd8727b8 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/VoteGivenLeaderboard.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/VoteGivenLeaderboard.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.bot.command.impl.stats;
+package com.diamondfire.helpbot.bot.command.impl.stats.top;
 
 import com.diamondfire.helpbot.bot.command.argument.ArgumentSet;
 import com.diamondfire.helpbot.bot.command.help.*;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java b/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java
index bd6cdc5f..6d0914c0 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java
@@ -1,21 +1,25 @@
 package com.diamondfire.helpbot.bot.command.permissions;
 
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.impl.Command;
 import net.dv8tion.jda.api.entities.Member;
 
-import java.util.HashMap;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public enum Permission {
-    BOT_DEVELOPER(589238520145510400L, 999),
-    DEVELOPER(519740942861860874L, 999),
+    DEVELOPER(999),
+    BOT_DEVELOPER(998),
     // Ask DragonSlasher, not me.
-    ADMINISTRATOR(180794313494495233L, 666),
-    MODERATION(180794061429538816L, 5),
-    EXPERT(299109861696995329L, 4),
-    SUPPORT(180794530398732288L, 3),
-    RETIRED_SUPPORT(235159617108181003L, 2),
-    USER(349434193517740033L, 1);
+    ADMINISTRATOR(666),
+    MODERATION(5),
+    SR_HELPER(4),
+    SUPPORT(3),
+    RETIRED_SUPPORT(2),
+    USER(1);
     
     private static final HashMap<Long, Permission> roleMap = new HashMap<>();
+    private static final HashMap<Command, Set<Long>> overrides = new HashMap<>();
     
     static {
         for (Permission perm : values()) {
@@ -26,8 +30,8 @@ public enum Permission {
     private final long role;
     private final int permissionLevel;
     
-    Permission(long roleID, int permissionLevel) {
-        this.role = roleID;
+    Permission(int permissionLevel) {
+        this.role = HelpBotInstance.getConfig().getPermissionRoleMap().get(this.name());
         this.permissionLevel = permissionLevel;
     }
     
@@ -39,6 +43,15 @@ public static Permission fromRole(long roleID) {
         return perm;
     }
     
+    public Permission setOverrides(Command command, Long... userIds) {
+        overrides.put(command, Arrays.stream(userIds).collect(Collectors.toSet()));
+        return this;
+    }
+    
+    public static Set<Long> getOverrides(Command command) {
+        return Objects.requireNonNullElse(overrides.get(command), new HashSet<>());
+    }
+    
     public long getRole() {
         return role;
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/reply/ReplyHandler.java b/src/main/java/com/diamondfire/helpbot/bot/command/reply/ReplyHandler.java
index 22e673a2..426fc6d1 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/reply/ReplyHandler.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/reply/ReplyHandler.java
@@ -2,17 +2,22 @@
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.requests.restaction.MessageAction;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import net.dv8tion.jda.api.requests.RestAction;
+import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
+import net.dv8tion.jda.api.utils.messages.MessageRequest;
 
 public class ReplyHandler {
     
-    private final TextChannel channel;
+    private final GuildMessageChannel channel;
     
-    public ReplyHandler(TextChannel channel) {
+    public ReplyHandler(GuildMessageChannel channel) {
         this.channel = channel;
     }
     
-    public TextChannel getChannel() {
+    public GuildMessageChannel getChannel() {
         return channel;
     }
     
@@ -36,19 +41,19 @@ public void reply(EmbedBuilder builder, MessageChannel channel) {
         embedReply(builder, channel).queue();
     }
     
-    public MessageAction replyA(PresetBuilder preset) {
+    public MessageCreateAction replyA(PresetBuilder preset) {
         return replyA(preset, getChannel());
     }
     
-    public MessageAction replyA(PresetBuilder preset, MessageChannel channel) {
+    public MessageCreateAction replyA(PresetBuilder preset, MessageChannel channel) {
         return embedReply(preset.getEmbed(), channel);
     }
     
-    public MessageAction embedReply(EmbedBuilder embed, MessageChannel channel) {
-        return channel.sendMessage(embed.build());
+    public MessageCreateAction embedReply(EmbedBuilder embed, MessageChannel channel) {
+        return channel.sendMessageEmbeds(embed.build());
     }
     
-    public MessageAction textReply(String msg, MessageChannel channel) {
+    public MessageCreateAction textReply(String msg, MessageChannel channel) {
         return channel.sendMessage(msg);
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/MinecraftUserPreset.java b/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/MinecraftUserPreset.java
index 5cbac97d..1bc49208 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/MinecraftUserPreset.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/MinecraftUserPreset.java
@@ -1,5 +1,6 @@
 package com.diamondfire.helpbot.bot.command.reply.feature;
 
+import com.diamondfire.helpbot.bot.command.argument.impl.types.minecraft.Player;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
 
@@ -8,6 +9,11 @@ public class MinecraftUserPreset implements ReplyPreset {
     private final String uuid;
     private final String player;
     
+    public MinecraftUserPreset(Player player) {
+        this.player = player.name();
+        this.uuid = player.uuidString();
+    }
+    
     public MinecraftUserPreset(String player) {
         this.player = player;
         this.uuid = null;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/informative/InformativeReplyType.java b/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/informative/InformativeReplyType.java
index bef112af..53b373a2 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/informative/InformativeReplyType.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/command/reply/feature/informative/InformativeReplyType.java
@@ -5,9 +5,9 @@
 import java.awt.*;
 
 public enum InformativeReplyType {
-    SUCCESS("Success!", Color.GREEN),
+    SUCCESS("Success!", new Color(46, 204, 113)),
     INFO("Notice!", null),
-    ERROR("Error!", Color.RED);
+    ERROR("Error!", new Color(231, 76, 60));
     
     private final String title;
     private final Color color;
diff --git a/src/main/java/com/diamondfire/helpbot/bot/config/Config.java b/src/main/java/com/diamondfire/helpbot/bot/config/Config.java
index 36106e8a..efd2756a 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/config/Config.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/config/Config.java
@@ -1,9 +1,13 @@
 package com.diamondfire.helpbot.bot.config;
 
+import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
 import com.google.gson.*;
+import com.google.gson.reflect.TypeToken;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class Config {
@@ -11,11 +15,10 @@ public class Config {
     private final JsonObject config;
     
     public Config() throws IllegalStateException {
-        try (BufferedReader txtReader2 = new BufferedReader(new FileReader(ExternalFiles.CONFIG.getPath()))) {
-            String config = txtReader2.lines().collect(Collectors.joining());
-            this.config = JsonParser.parseString(config).getAsJsonObject();
+        try {
+            this.config = HelpBotInstance.GSON.fromJson(Files.readString(ExternalFiles.CONFIG.toPath()), JsonObject.class);
         } catch (Exception exception) {
-            throw new IllegalStateException("Config not correctly structured! Please check the readme file for a config template.");
+            throw new IllegalStateException("Config not correctly structured! Please check the readme file for a config template.", exception);
         }
     }
     
@@ -56,6 +59,10 @@ public String getDBPassword() {
     
     // General constants
     
+    public String getlabsCoreToken() {
+        return getPropertyString("labs_token");
+    }
+    
     public long getGuild() {
         return getPropertyLong("guild");
     }
@@ -68,6 +75,18 @@ public long getDiscussionChannel() {
         return getPropertyLong("discussion_channel");
     }
     
+    public long getPurgeEvidenceChannel() {
+        return getPropertyLong("purge_evidence_channel");
+    }
+    
+    public long getHelpChannel() {
+        return getPropertyLong("help_channel");
+    }
+    
+    public long getHelpChannelSolvedTag() {
+        return getPropertyLong("help_channel_solved_tag");
+    }
+    
     public long getMutedRole() {
         return getPropertyLong("muted_role");
     }
@@ -76,6 +95,18 @@ public long getVerifiedRole() {
         return getPropertyLong("verified_role");
     }
     
+    public JsonObject getForwardingChannels() {
+        return config.get("forwarding_channels").getAsJsonObject();
+    }
+    
+    public Map<String, Long> getPermissionRoleMap() {
+        return HelpBotInstance.GSON.fromJson(config.get("permission_roles"), new TypeToken<Map<String, Long>>(){}.getType());
+    }
+    
+    public long getPermission(String role) {
+        return this.config.get("permission_roles").getAsJsonObject().get(role).getAsLong();
+    }
+    
     private long getPropertyLong(String property) {
         return config.get(property).getAsLong();
     }
@@ -83,5 +114,4 @@ private long getPropertyLong(String property) {
     private String getPropertyString(String property) {
         return config.get(property).getAsString();
     }
-    
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/ButtonEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/ButtonEvent.java
new file mode 100644
index 00000000..908833d8
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/ButtonEvent.java
@@ -0,0 +1,14 @@
+package com.diamondfire.helpbot.bot.events;
+
+import com.diamondfire.helpbot.sys.interaction.button.ButtonHandler;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.jetbrains.annotations.NotNull;
+
+public class ButtonEvent extends ListenerAdapter {
+    
+    @Override
+    public void onButtonInteraction(@NotNull ButtonInteractionEvent event) {
+        ButtonHandler.handleEvent(event);
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/ChannelCreatedEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/ChannelCreatedEvent.java
new file mode 100644
index 00000000..254a5b5a
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/ChannelCreatedEvent.java
@@ -0,0 +1,40 @@
+package com.diamondfire.helpbot.bot.events;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
+import net.dv8tion.jda.api.events.channel.ChannelCreateEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import java.util.ArrayList;
+
+public class ChannelCreatedEvent extends ListenerAdapter {
+    
+    @Override
+    public void onChannelCreate(ChannelCreateEvent event) {
+        // Limit to help forum.
+        if (
+                event.getChannel().getType() != ChannelType.GUILD_PUBLIC_THREAD ||
+                        event.getChannel().asThreadChannel().getParentChannel().getIdLong() != HelpBotInstance.getConfig().getHelpChannel()
+        ) {
+            return;
+        }
+        
+        // Remove solved tag if post was created with it.
+        ThreadChannel threadChannel = event.getChannel().asThreadChannel();
+        
+        ForumTag solvedTag = threadChannel.getParentChannel().asForumChannel().getAvailableTagById(HelpBotInstance.getConfig().getHelpChannelSolvedTag());
+        if (threadChannel.getAppliedTags().contains(solvedTag)) {
+            ArrayList<ForumTag> appliedTags = new ArrayList<>(threadChannel.getAppliedTags());
+            // Solved tag is the only tag, and we need at least one tag.
+            // In this case, this will do nothing, however ?solved will still change post's the name, so it's fine.
+            if (appliedTags.size() != 1) {
+                appliedTags.remove(solvedTag);
+            }
+            threadChannel.getManager().setAppliedTags(appliedTags).queue();
+        }
+        
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/ChannelUpdatedNameEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/ChannelUpdatedNameEvent.java
new file mode 100644
index 00000000..8289e6c6
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/ChannelUpdatedNameEvent.java
@@ -0,0 +1,40 @@
+package com.diamondfire.helpbot.bot.events;
+
+import com.diamondfire.helpbot.util.SolvedPostManager;
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
+import net.dv8tion.jda.api.events.channel.update.*;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.jetbrains.annotations.*;
+
+import java.util.Optional;
+
+public class ChannelUpdatedNameEvent extends ListenerAdapter {
+    
+    @Override
+    public void onChannelUpdateName(@NotNull ChannelUpdateNameEvent event) {
+        Optional<ThreadChannel> optionalChannel = SolvedPostManager.getHelpPost(event.getChannel());
+        if (optionalChannel.isEmpty()) {
+            return;
+        }
+        ThreadChannel threadChannel = optionalChannel.get();
+        
+        Optional<ForumTag> optionalTag = SolvedPostManager.getSolvedTag(threadChannel);
+        if (optionalTag.isEmpty() || event.getOldValue() == null || event.getNewValue() == null) {
+            return;
+        }
+        ForumTag solvedTag = optionalTag.get();
+        
+        if (event.getOldValue().startsWith("[SOLVED] ") && !event.getNewValue().startsWith("[SOLVED] ") &&
+                threadChannel.getAppliedTags().contains(solvedTag)) {
+            
+            SolvedPostManager.removeSolved(threadChannel);
+        }
+        else if (!event.getOldValue().startsWith("[SOLVED] ") && event.getNewValue().startsWith("[SOLVED] ") &&
+                !threadChannel.getAppliedTags().contains(solvedTag)) {
+            
+            SolvedPostManager.addSolved(threadChannel);
+        }
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/CommandEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/CommandEvent.java
index de911cae..c5220bd9 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/events/CommandEvent.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/CommandEvent.java
@@ -1,22 +1,23 @@
 package com.diamondfire.helpbot.bot.events;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.ParsedArgumentSet;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
 import com.diamondfire.helpbot.bot.command.argument.impl.parsing.parser.ArgumentParser;
 import com.diamondfire.helpbot.bot.command.impl.Command;
 import com.diamondfire.helpbot.bot.command.reply.*;
-import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.util.*;
 
-public class CommandEvent extends GuildMessageReceivedEvent {
+public class CommandEvent extends MessageReceivedEvent {
     
-    private final Command command;
-    private final ReplyHandler replyHandler = new ReplyHandler(getChannel());
-    //TODO Cleanup and refactor this. I'd like to see stuff like replying be put into it's whole own section and refactored as well.
+    private Command command;
+    private final ReplyHandler replyHandler = new ReplyHandler(getChannel().asGuildMessageChannel());
+    //TODO Cleanup and refactor this.
+    // I'd like to see stuff like replying be put into it's whole own section and refactored as well.
     private ParsedArgumentSet parsedArgumentSet = null;
     private String aliasedUsed = null;
     
@@ -25,24 +26,27 @@ public CommandEvent(Message message) {
         String[] rawArgs = getMessage().getContentDisplay().split(" ");
         String commandPrefix = rawArgs[0].substring(HelpBotInstance.getConfig().getPrefix().length()).toLowerCase();
         
-        
-        Command cmd = HelpBotInstance.getHandler().getCommands().get(commandPrefix.toLowerCase());
+        Command cmd = CommandHandler.getInstance().getCommands().get(commandPrefix.toLowerCase());
         if (cmd == null) {
             this.aliasedUsed = commandPrefix.toLowerCase();
-            cmd = HelpBotInstance.getHandler().getAliases().get(commandPrefix.toLowerCase());
+            cmd = CommandHandler.getInstance().getAliases().get(commandPrefix.toLowerCase());
         }
         
         this.command = cmd;
     }
     
     public void pushArguments(String[] rawArgs) throws ArgumentException {
-        this.parsedArgumentSet = ArgumentParser.parseArgs(command, Arrays.copyOfRange(rawArgs, 1, rawArgs.length));
+        this.parsedArgumentSet = ArgumentParser.parseArgs(command, Arrays.copyOfRange(rawArgs, 1, rawArgs.length), this);
     }
     
     public Command getCommand() {
         return command;
     }
     
+    public void setCommand(Command command) {
+        this.command = command;
+    }
+    
     public void reply(PresetBuilder preset) {
         replyHandler.reply(preset, getChannel());
     }
@@ -62,4 +66,8 @@ public ReplyHandler getReplyHandler() {
     public String getAliasUsed() {
         return aliasedUsed;
     }
+    
+    public String[] getRawArgs() {
+        return getMessage().getContentRaw().split("\\s+");
+    }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/GuildJoinEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/GuildJoinEvent.java
index 55ded05d..71e23123 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/events/GuildJoinEvent.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/GuildJoinEvent.java
@@ -1,23 +1,19 @@
 package com.diamondfire.helpbot.bot.events;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
-import com.diamondfire.helpbot.sys.rolereact.RoleReactListener;
 import com.diamondfire.helpbot.sys.tasks.impl.MuteExpireTask;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
-import javax.annotation.Nonnull;
-
 public class GuildJoinEvent extends ListenerAdapter {
     
     @Override
-    public void onGuildMemberJoin(@Nonnull GuildMemberJoinEvent event) {
+    public void onGuildMemberJoin(GuildMemberJoinEvent event) {
         if (event.getGuild().getIdLong() == HelpBotInstance.DF_GUILD) {
             Member member = event.getMember();
             Util.updateMember(member);
-            RoleReactListener.refreshRoles(member);
             MuteExpireTask.handle(member);
         }
     }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/MessageEditEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/MessageEditEvent.java
new file mode 100644
index 00000000..1c6c5e8d
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/MessageEditEvent.java
@@ -0,0 +1,25 @@
+package com.diamondfire.helpbot.bot.events;
+
+import com.diamondfire.helpbot.sys.message.acceptors.*;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+public class MessageEditEvent extends ListenerAdapter {
+    
+    private static final MessageAcceptor[] acceptors = {
+            new FilterAcceptor(),
+    };
+    
+    @Override
+    public void onMessageUpdate(MessageUpdateEvent event) {
+        Message message = event.getMessage();
+        for (MessageAcceptor acceptor : acceptors) {
+            if (acceptor.accept(message)) {
+                break;
+            }
+        }
+        
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/MessageEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/MessageEvent.java
index 4bef0b9f..c6aa6220 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/events/MessageEvent.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/MessageEvent.java
@@ -2,24 +2,26 @@
 
 import com.diamondfire.helpbot.sys.message.acceptors.*;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.*;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 public class MessageEvent extends ListenerAdapter {
     
-    private static final MessageAcceptor[] acceptors = new MessageAcceptor[]{new FilterAcceptor(), new CommandAcceptor()};
+    private static final MessageAcceptor[] acceptors = {
+            new FilterAcceptor(),
+            new CommandAcceptor(),
+            new TagAcceptor(),
+            new VerifyAcceptor()
+    };
     
     @Override
-    public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
+    public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         Message message = event.getMessage();
         for (MessageAcceptor acceptor : acceptors) {
-            if (!acceptor.accept(message)) {
+            if (acceptor.accept(message)) {
                 break;
             }
         }
-        
     }
-    
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/PostChannelEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/PostChannelEvent.java
new file mode 100644
index 00000000..1a9f8d5d
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/PostChannelEvent.java
@@ -0,0 +1,34 @@
+package com.diamondfire.helpbot.bot.events;
+
+import com.diamondfire.helpbot.util.SolvedPostManager;
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
+import net.dv8tion.jda.api.events.channel.update.*;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import java.util.Optional;
+
+public class PostChannelEvent extends ListenerAdapter {
+    
+    @Override
+    public void onChannelUpdateAppliedTags(ChannelUpdateAppliedTagsEvent event) {
+        Optional<ThreadChannel> optionalChannel = SolvedPostManager.getHelpPost(event.getChannel());
+        if (optionalChannel.isEmpty()) {
+            return;
+        }
+        ThreadChannel threadChannel = optionalChannel.get();
+        
+        Optional<ForumTag> optionalTag = SolvedPostManager.getSolvedTag(threadChannel);
+        if (optionalTag.isEmpty()) {
+            return;
+        }
+        ForumTag solvedTag = optionalTag.get();
+        
+        if (event.getAddedTags().contains(solvedTag)) {
+            SolvedPostManager.addSolved(threadChannel);
+        } else if (event.getRemovedTags().contains(solvedTag)) {
+            SolvedPostManager.removeSolved(threadChannel);
+        }
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/ReactionEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/ReactionEvent.java
deleted file mode 100644
index 39d6b378..00000000
--- a/src/main/java/com/diamondfire/helpbot/bot/events/ReactionEvent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.diamondfire.helpbot.bot.events;
-
-import com.diamondfire.helpbot.sys.reactions.impl.ReactionHandler;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.MessageReaction;
-import net.dv8tion.jda.api.events.message.guild.react.GuildMessageReactionAddEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import javax.annotation.Nonnull;
-
-public class ReactionEvent extends ListenerAdapter {
-    
-    @Override
-    public void onGuildMessageReactionAdd(@Nonnull GuildMessageReactionAddEvent event) {
-        if (event.getMember().getUser().isBot()) return;
-        
-        if (ReactionHandler.isMessageReserved(event.getMessageIdLong())) {
-            event.getReaction().retrieveUsers().queue((users) -> {
-                if (!users.contains(event.getJDA().getSelfUser()) || !ReactionHandler.isWaiting(event.getMember().getIdLong())) {
-                    if (event.getGuild().getSelfMember().hasPermission(event.getChannel(), Permission.MESSAGE_MANAGE)) {
-                        MessageReaction.ReactionEmote emote = event.getReactionEmote();
-                        if (emote.isEmoji()) {
-                            event.getChannel().removeReactionById(event.getMessageIdLong(), emote.getEmoji(), event.getUser()).queue();
-                        } else if (emote.isEmote()) {
-                            event.getChannel().removeReactionById(event.getMessageIdLong(), emote.getEmote(), event.getUser()).queue();
-                        }
-                        
-                    }
-                } else {
-                    if (ReactionHandler.isWaiting(event.getMember().getIdLong())) {
-                        ReactionHandler.handleReaction(event);
-                    }
-                }
-            });
-        }
-    }
-}
diff --git a/src/main/java/com/diamondfire/helpbot/bot/events/ReadyEvent.java b/src/main/java/com/diamondfire/helpbot/bot/events/ReadyEvent.java
index 8f356ba4..52e20823 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/events/ReadyEvent.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/events/ReadyEvent.java
@@ -2,20 +2,18 @@
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.bot.restart.RestartHandler;
+import com.diamondfire.helpbot.sys.report.ReportListener;
 import com.diamondfire.helpbot.sys.rolereact.RoleReactListener;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 public class ReadyEvent extends ListenerAdapter {
     
     @Override
-    public void onReady(@Nonnull net.dv8tion.jda.api.events.ReadyEvent event) {
-        super.onReady(event);
-        
+    public void onReady(@NotNull net.dv8tion.jda.api.events.session.ReadyEvent event) {
         RestartHandler.recover(event.getJDA());
         HelpBotInstance.getScheduler().initialize();
         
-        event.getJDA().addEventListener(new RoleReactListener());
+        event.getJDA().addEventListener(new RoleReactListener(), new ReportListener());
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/bot/restart/RestartHandler.java b/src/main/java/com/diamondfire/helpbot/bot/restart/RestartHandler.java
index d35be628..e68ec8c6 100644
--- a/src/main/java/com/diamondfire/helpbot/bot/restart/RestartHandler.java
+++ b/src/main/java/com/diamondfire/helpbot/bot/restart/RestartHandler.java
@@ -36,7 +36,7 @@ public static void recover(JDA jda) {
             builder.setTitle("Restart Successful!");
             builder.setDescription("Restarted in " + FormatUtil.formatMilliTime(System.currentTimeMillis() - Long.parseLong(restartMSG[2])));
             
-            jda.getTextChannelById(restartMSG[1]).editMessageById(restartMSG[0], builder.build()).override(true).queue();
+            jda.getTextChannelById(restartMSG[1]).editMessageEmbedsById(restartMSG[0], builder.build()).setReplace(true).queue();
             restart.delete();
         } catch (IOException | ArrayIndexOutOfBoundsException ignored) {
         }
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/changelog/CodeDifferenceHandler.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/changelog/CodeDifferenceHandler.java
index ab13c1cf..a9f80311 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/changelog/CodeDifferenceHandler.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/changelog/CodeDifferenceHandler.java
@@ -11,8 +11,6 @@
 
 public class CodeDifferenceHandler {
     
-    //TODO Cleanup
-    
     static StringBuilder differences = new StringBuilder();
     static ArrayList<String> differs = new ArrayList<>();
     
@@ -21,7 +19,7 @@ public static void refresh() {
         differs = new ArrayList<>();
         try {
             generateDifferences();
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -39,41 +37,17 @@ public static void setComparer(File toCompare) {
     private static void generateDifferences() throws IOException {
         
         BufferedReader txtReader = new BufferedReader(new FileReader(ExternalFiles.DB_COMPARE.getPath()));
-        String json = txtReader.lines().collect(Collectors.joining());
-        txtReader.close();
-        
-        JsonReader reader = new JsonReader(new StringReader(json));
-        //reader.setLenient(true);
-        
         BufferedReader txtReader2 = new BufferedReader(new FileReader(ExternalFiles.DB.getPath()));
-        String json2 = txtReader2.lines().collect(Collectors.joining());
-        txtReader2.close();
-        
-        JsonReader reader2 = new JsonReader(new StringReader(json2));
-        //reader2.setLenient(true);
-        
-        JsonObject objectOld;
-        try {
-            objectOld = JsonParser.parseReader(reader).getAsJsonObject();
-        } catch (Exception e) {
-            System.out.println("Old db is corrupted, rewriting!");
-            Files.copy(ExternalFiles.DB.toPath(), ExternalFiles.DB_COMPARE.toPath(), StandardCopyOption.REPLACE_EXISTING);
-            return;
-        }
-        // Setup the reader to prevent parsing problems.
-        
-        JsonObject object = JsonParser.parseReader(reader2).getAsJsonObject();
-        
-        // object is new
-        // object old is old instance
         
+        List<JsonObject> jsonObjects = readDiff(txtReader,txtReader2);
         
-        compare(object.get("codeblocks").getAsJsonArray(), objectOld.get("codeblocks").getAsJsonArray(), "name");
-        compare(object.get("actions").getAsJsonArray(), objectOld.get("actions").getAsJsonArray(), "name");
-        compare(object.get("gameValues").getAsJsonArray(), objectOld.get("gameValues").getAsJsonArray(), "name");
-        compare(object.get("particles").getAsJsonArray(), objectOld.get("particles").getAsJsonArray(), "particle");
-        compare(object.get("potions").getAsJsonArray(), objectOld.get("potions").getAsJsonArray(), "potion");
-        compare(object.get("sounds").getAsJsonArray(), objectOld.get("sounds").getAsJsonArray(), "sound");
+        //Clean up here maybe possible but it isn't that bad
+        compare(jsonObjects.get(0).get("codeblocks").getAsJsonArray(), jsonObjects.get(1).get("codeblocks").getAsJsonArray(), "name");
+        compare(jsonObjects.get(0).get("actions").getAsJsonArray(), jsonObjects.get(1).get("actions").getAsJsonArray(), "name");
+        compare(jsonObjects.get(0).get("gameValues").getAsJsonArray(), jsonObjects.get(1).get("gameValues").getAsJsonArray(), "name");
+        compare(jsonObjects.get(0).get("particles").getAsJsonArray(), jsonObjects.get(1).get("particles").getAsJsonArray(), "particle");
+        compare(jsonObjects.get(0).get("potions").getAsJsonArray(), jsonObjects.get(1).get("potions").getAsJsonArray(), "potion");
+        compare(jsonObjects.get(0).get("sounds").getAsJsonArray(), jsonObjects.get(1).get("sounds").getAsJsonArray(), "sound");
         if (differs.size() >= 20) {
             differences.append(String.format("\n+ %s Modifications...", differs.size()));
         } else {
@@ -136,6 +110,37 @@ private static void compare(JsonArray array, JsonArray oldArray, String keyName)
             e.printStackTrace();
         }
     }
+    
+    /**
+     * Does stuff with readers to parse old and new JSON data
+     *
+     * @param readers - readers being parsed
+     * @return parsed JsonObjects
+     * @throws IOException {@link BufferedReader#close()}
+     */
+    private static List<JsonObject> readDiff(BufferedReader... readers) throws IOException {
+        List<JsonObject> jsonObjects = new ArrayList<>();
+        
+        for (BufferedReader reader : readers) {
+            String rawJson = reader.lines().collect(Collectors.joining());
+            reader.close();
+            
+            JsonReader readerJson = new JsonReader(new StringReader(rawJson));
+            
+            JsonObject jsonObject = null;
+            try {
+                jsonObject = JsonParser.parseReader(readerJson).getAsJsonObject();
+            } catch (Exception e) {
+                System.out.println("Old db is corrupted, rewriting!");
+                Files.copy(ExternalFiles.DB.toPath(), ExternalFiles.DB_COMPARE.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            }
+            
+            jsonObjects.add(jsonObject);
+        }
+        
+        
+        return jsonObjects;
+    }
 }
 
 
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/CodeDatabase.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/CodeDatabase.java
index dec07d6a..5d8eff7a 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/CodeDatabase.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/CodeDatabase.java
@@ -31,7 +31,8 @@ public static void initialize() {
             CodeDatabase.initDatabase(JsonParser.parseReader(reader).getAsJsonObject());
             System.out.println("Database loaded!");
         } catch (Exception e) {
-            System.out.println("Malformed codeblock database.");
+            e.printStackTrace();
+           // System.out.println("Malformed codeblock database.");
         }
     }
     
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/CodeBlockTagData.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/CodeBlockTagData.java
index 54fba29d..cdc5bf03 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/CodeBlockTagData.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/CodeBlockTagData.java
@@ -1,6 +1,7 @@
 package com.diamondfire.helpbot.df.codeinfo.codedatabase.db.datatypes;
 
 import com.google.gson.*;
+import com.diamondfire.helpbot.util.Util;
 
 import java.util.*;
 
@@ -43,6 +44,10 @@ public CodeBlockTagOption[] getOptions() {
         return option.toArray(new CodeBlockTagOption[]{});
     }
     
+    public String[] getAliases() {
+        return Util.fromJsonArray(data.get("aliases").getAsJsonArray());
+    }
+    
     public DisplayIcon getItem() {
         return new DisplayIcon((JsonObject) data.get("icon"));
     }
@@ -51,6 +56,10 @@ public String getDefaultValue() {
         return data.get("defaultOption").getAsString();
     }
     
+    public JsonObject getJson() {
+        return data;
+    }
+    
     public static class CodeBlockTagOption {
         
         private final JsonObject optionData;
@@ -66,6 +75,10 @@ public String getName() {
         public DisplayIcon getIcon() {
             return new DisplayIcon(optionData.get("icon").getAsJsonObject());
         }
+    
+        public JsonObject getJson() {
+            return optionData;
+        }
     }
     
 }
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/DisplayIcon.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/DisplayIcon.java
index 148b14a3..07364aba 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/DisplayIcon.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/codedatabase/db/datatypes/DisplayIcon.java
@@ -2,7 +2,6 @@
 
 import com.diamondfire.helpbot.util.*;
 import com.google.gson.*;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/BasicReaction.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/BasicReaction.java
index 74c2b571..ab48cacf 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/BasicReaction.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/BasicReaction.java
@@ -2,66 +2,41 @@
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.emoji.*;
 import net.dv8tion.jda.api.requests.RestAction;
 
 public class BasicReaction {
     
-    final boolean isUnicode;
-    String unicode;
-    long id;
+    private final Emoji emoji;
     
-    public BasicReaction(String unicode) {
-        isUnicode = true;
-        this.unicode = unicode;
+    public BasicReaction(Emoji emoji) {
+        this.emoji = emoji;
     }
     
-    public BasicReaction(long emoteID) {
-        isUnicode = false;
-        this.id = emoteID;
-    }
     
     
     public String getUnicode() {
-        if (!isUnicode) {
+        if (emoji.getType() != Emoji.Type.UNICODE) {
             throw new IllegalStateException("Emoji is not a unicode char!");
         }
         
-        return unicode;
+        return emoji.getName();
     }
     
-    public Emote getEmote() {
-        if (isUnicode) {
-            throw new IllegalStateException("Emoji is a unicode char!");
+    public CustomEmoji getEmote() {
+        if (emoji.getType() != Emoji.Type.CUSTOM) {
+            throw new IllegalStateException("Emoji is not a unicode char!");
         }
         
-        return HelpBotInstance.getJda().getEmoteById(id);
+        return (CustomEmoji) emoji;
     }
     
     public RestAction<Void> react(Message message) {
-        if (isUnicode) {
-            return message.addReaction(getUnicode());
-        }
-        
-        return message.addReaction(getEmote());
+        return message.addReaction(emoji);
     }
     
     @Override
     public String toString() {
-        if (isUnicode) {
-            return getUnicode();
-        }
-        
-        return getEmote().getAsMention();
-    }
-    
-    public boolean equalToReaction(MessageReaction.ReactionEmote reaction) {
-        // if reaction is emoji yet this isn't unicode error is thrown.
-        if (reaction.isEmoji() != isUnicode) {
-            return false;
-        }
-        
-        if (reaction.isEmoji()) return getUnicode().equals(reaction.getEmoji());
-        if (!reaction.isEmoji()) return getEmote().getIdLong() == reaction.getIdLong();
-        return false;
+        return this.emoji.getFormatted();
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/constants/CodeBlockEnum.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/constants/CodeBlockEnum.java
index 47c9ab9b..aed8acf0 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/constants/CodeBlockEnum.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/constants/CodeBlockEnum.java
@@ -1,8 +1,7 @@
 package com.diamondfire.helpbot.df.codeinfo.viewables.constants;
 
-import com.diamondfire.helpbot.HelpBot;
 import com.diamondfire.helpbot.bot.HelpBotInstance;
-import net.dv8tion.jda.api.entities.Emote;
+import net.dv8tion.jda.api.entities.emoji.*;
 
 import java.awt.*;
 import java.util.Map;
@@ -54,7 +53,7 @@ public String getID() {
     }
     
     
-    public Emote getEmoji() {
-        return HelpBotInstance.getJda().getEmotesByName(getID(), true).get(0);
+    public CustomEmoji getEmoji() {
+        return HelpBotInstance.getJda().getEmojisByName(getID(), true).get(0);
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeActionEmbedBuilder.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeActionEmbedBuilder.java
index 457ea27b..02e791f2 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeActionEmbedBuilder.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeActionEmbedBuilder.java
@@ -5,7 +5,7 @@
 import com.diamondfire.helpbot.df.codeinfo.viewables.BasicReaction;
 import com.diamondfire.helpbot.util.StringUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Emote;
+import net.dv8tion.jda.api.entities.emoji.*;
 
 import java.util.*;
 
@@ -13,7 +13,7 @@ public class CodeActionEmbedBuilder implements IconEmbedBuilder<ActionData> {
     
     @Override
     public EmbedBuilder buildDataEmbed(ActionData data) {
-        Emote emote = data.getCodeBlockData().getCodeblockEnum().getEmoji();
+        CustomEmoji emote = data.getCodeBlockData().getCodeblockEnum().getEmoji();
         EmbedBuilder builder = new EmbedBuilder()
                 .setColor(data.getCodeBlockData().getCodeblockEnum().getColor())
                 .setAuthor(StringUtil.smartCaps(data.getCodeblockName()), null, emote.getImageUrl());
@@ -34,7 +34,7 @@ public LinkedHashMap<BasicReaction, CodeObject> generateDupeEmojis(List<CodeObje
         LinkedHashMap<BasicReaction, CodeObject> dataHashed = new LinkedHashMap<>();
         for (CodeObject data : dataArrayList) {
             ActionData actionData = (ActionData) data;
-            dataHashed.put(new BasicReaction(actionData.getCodeBlockData().getCodeblockEnum().getEmoji().getIdLong()), data);
+            dataHashed.put(new BasicReaction(actionData.getCodeBlockData().getCodeblockEnum().getEmoji()), data);
         }
         
         return dataHashed;
@@ -70,6 +70,6 @@ private void generateParameters(CodeObject data, EmbedBuilder builder) {
             params.append("(None)");
         }
         
-        builder.addField("<:chest:789269855886901288> Parameters", params.toString(), false);
+        builder.addField("<:c_chest:988240071960461402> Parameters", params.toString(), false);
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeDisplayBuilder.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeDisplayBuilder.java
index 601585b5..164261a4 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeDisplayBuilder.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/CodeDisplayBuilder.java
@@ -5,6 +5,7 @@
 import com.diamondfire.helpbot.df.codeinfo.viewables.BasicReaction;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 
 import java.util.*;
 
@@ -57,7 +58,7 @@ default LinkedHashMap<BasicReaction, CodeObject> generateDupeEmojis(List<CodeObj
         Deque<String> nums = Util.getUnicodeNumbers();
         LinkedHashMap<BasicReaction, CodeObject> dataHashed = new LinkedHashMap<>();
         for (CodeObject data : dataArrayList) {
-            dataHashed.put(new BasicReaction(nums.pop()), data);
+            dataHashed.put(new BasicReaction(Emoji.fromUnicode(nums.pop())), data);
         }
         
         return dataHashed;
diff --git a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/IconEmbedBuilder.java b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/IconEmbedBuilder.java
index 65b96915..18352881 100644
--- a/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/IconEmbedBuilder.java
+++ b/src/main/java/com/diamondfire/helpbot/df/codeinfo/viewables/embeds/IconEmbedBuilder.java
@@ -53,7 +53,8 @@ default void generateInfo(T data, EmbedBuilder builder) {
     
     enum ParamConverter {
         ANY_TYPE("Any Value"),
-        TEXT("Text"),
+        TEXT("String"),
+        COMPONENT("Styled Text"),
         NUMBER("Number"),
         LOCATION("Location"),
         VECTOR("Vector"),
@@ -62,6 +63,7 @@ enum ParamConverter {
         POTION("Potion"),
         VARIABLE("Variable"),
         LIST("List"),
+        DICT("Dictionary"),
         ITEM("Item"),
         PROJECTILE("Projectile"),
         SPAWN_EGG("Spawn Egg"),
diff --git a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java
index 8628606e..771f5121 100644
--- a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java
+++ b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java
@@ -1,7 +1,7 @@
 package com.diamondfire.helpbot.df.ranks;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
-import net.dv8tion.jda.api.entities.Emote;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 
 public enum Rank {
     // Ranks
@@ -18,7 +18,7 @@ public enum Rank {
     // Support
     JRHELPER("JrHelper", 1, RankBranch.SUPPORT, "S_JrHelper"),
     HELPER("Helper", 2, RankBranch.SUPPORT, "Helper"),
-    EXPERT("Expert", 3, RankBranch.SUPPORT, "S_Expert"),
+    SR_HELPER("SrHelper", 3, RankBranch.SUPPORT, "S_Expert"),
     // Moderation
     JRMOD("JrMod", 1, RankBranch.MODERATION, "JrModerator"),
     MOD("Mod", 2, RankBranch.MODERATION, "Moderator"),
@@ -31,13 +31,13 @@ public enum Rank {
     private final String rankName;
     private final int number;
     private final RankBranch category;
-    private final Emote emote;
+    private final Emoji emote;
     
     Rank(String rankName, int number, RankBranch category, String emote) {
         this.rankName = rankName;
         this.number = number;
         this.category = category;
-        this.emote = HelpBotInstance.getJda().getGuildById(615846886414483465L).getEmotesByName(emote, false).get(0);
+        this.emote = HelpBotInstance.getJda().getGuildById(615846886414483465L).getEmojisByName(emote, false).get(0);
     }
     
     public String getRankName() {
@@ -62,7 +62,7 @@ public static Rank fromBranch(RankBranch branch, int rankNum) {
         return null;
     }
     
-    public Emote getRankEmote() {
+    public Emoji getRankEmote() {
         return emote;
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/sys/database/impl/queries/BasicQuery.java b/src/main/java/com/diamondfire/helpbot/sys/database/impl/queries/BasicQuery.java
index 6c8eb7b2..28601ed1 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/database/impl/queries/BasicQuery.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/database/impl/queries/BasicQuery.java
@@ -24,7 +24,7 @@ public BasicQuery(@NotNull @Language("SQL") String query, @Nullable PreparedStat
     @Override
     public ResultSet execute(@NotNull Connection connection) throws SQLException {
         PreparedStatement statement = connection.prepareStatement(query);
-        statement.setQueryTimeout(5);
+        statement.setQueryTimeout(10);
         
         if (provider != null) {
             provider.prepare(statement);
diff --git a/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFileUtil.java b/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFileUtil.java
index cbd286b2..3eb17689 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFileUtil.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFileUtil.java
@@ -5,7 +5,6 @@
 public class ExternalFileUtil {
     
     public static File generateFile(String name) throws IOException {
-        
         File file = new File(ExternalFiles.OTHER_CACHE_DIR, name);
         if (file.exists()) {
             file.delete();
diff --git a/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFiles.java b/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFiles.java
index 95799afc..2becc72c 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFiles.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFiles.java
@@ -1,7 +1,6 @@
 package com.diamondfire.helpbot.sys.externalfile;
 
 import java.io.File;
-import java.net.URL;
 
 public interface ExternalFiles {
     
@@ -55,4 +54,22 @@ public interface ExternalFiles {
             .setName("samman")
             .setFileType("png")
             .buildFile();
+    
+    File TAGS = new ExternalFileBuilder()
+            .isDirectory(false)
+            .setName("tags")
+            .setFileType("json")
+            .buildFile();
+    
+    File VIP_ROLES = new ExternalFileBuilder()
+            .isDirectory(false)
+            .setName("vip_roles")
+            .setFileType("json")
+            .buildFile();
+    
+    File SAM_QUOTES = new ExternalFileBuilder()
+            .isDirectory(false)
+            .setName("samquotes")
+            .setFileType("txt")
+            .buildFile();
 }
diff --git a/src/main/java/com/diamondfire/helpbot/sys/graph/generators/GraphGenerators.java b/src/main/java/com/diamondfire/helpbot/sys/graph/generators/GraphGenerators.java
index 57a6e823..a115cbd6 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/graph/generators/GraphGenerators.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/graph/generators/GraphGenerators.java
@@ -6,15 +6,15 @@ public interface GraphGenerators {
             "SELECT time, COUNT(*) AS count " +
             "FROM (SELECT DISTINCT uuid, DATE_FORMAT(time, ?) AS time" +
             "      FROM player_join_log" +
-            "      WHERE time > ((NOW() - INTERVAL ? HOUR) - INTERVAL MINUTE(NOW()) MINUTE) - INTERVAL SECOND(NOW()) SECOND" +
+            "      WHERE time > (((NOW() - INTERVAL ? HOUR) - INTERVAL MINUTE(NOW()) MINUTE) - INTERVAL SECOND(NOW()) SECOND) - INTERVAL HOUR(NOW()) HOUR" +
             "        AND uuid NOT IN (SELECT uuid FROM litebans.bans WHERE active = 1 AND until = -1)) a " +
             "GROUP BY time");
     
     QueryGraphGenerator NEW_PLAYERS = new QueryGraphGenerator("new player joins", "" +
             "SELECT time, COUNT(*) AS count " +
-            "FROM (SELECT DISTINCT uuid, DATE_FORMAT(time, ?) AS time" +
-            "      FROM approved_users" +
-            "      WHERE time > ((NOW() - INTERVAL ? HOUR) - INTERVAL MINUTE(NOW()) MINUTE) - INTERVAL SECOND(NOW()) SECOND" +
+            "FROM (SELECT DISTINCT uuid, DATE_FORMAT(join_date, ?) AS time" +
+            "      FROM players" +
+            "      WHERE join_date > (((NOW() - INTERVAL ? HOUR) - INTERVAL MINUTE(NOW()) MINUTE) - INTERVAL SECOND(NOW()) SECOND) - INTERVAL HOUR(NOW()) HOUR" +
             "        AND uuid NOT IN (SELECT uuid FROM litebans.bans WHERE active = 1 AND until = -1)) a " +
             "GROUP BY time");
     
diff --git a/src/main/java/com/diamondfire/helpbot/sys/interaction/button/ButtonHandler.java b/src/main/java/com/diamondfire/helpbot/sys/interaction/button/ButtonHandler.java
new file mode 100644
index 00000000..692b5d11
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/interaction/button/ButtonHandler.java
@@ -0,0 +1,53 @@
+package com.diamondfire.helpbot.sys.interaction.button;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.util.TemporaryRunnableStorage;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.utils.messages.MessageEditData;
+
+import java.util.Collections;
+import java.util.function.Consumer;
+
+public class ButtonHandler {
+    
+    private static final TemporaryRunnableStorage<Long, ButtonListener> BUTTON_CONSUMERS = new TemporaryRunnableStorage<>();
+    
+    public static void addListener(long user, Message message, Consumer<ButtonInteractionEvent> consumer, boolean persistent) {
+        BUTTON_CONSUMERS.put(message.getIdLong(), new ButtonListener(user, consumer), () -> {
+            HelpBotInstance.getJda()
+                    .getTextChannelById(message.getChannel().getIdLong()).retrieveMessageById(message.getIdLong())
+                    .flatMap((msg) -> persistent, (msg) -> message.editMessage(MessageEditData.fromMessage(message)).setComponents(Collections.emptyList()))
+                    .queue();
+        }, persistent);
+    }
+    
+    public static void addListener(long user, Message message, Consumer<ButtonInteractionEvent> consumer) {
+        addListener(user, message, consumer, false);
+    }
+    
+    public static void handleEvent(ButtonInteractionEvent event) {
+        ButtonListener listener = BUTTON_CONSUMERS.get(event.getMessageIdLong());
+        if (listener != null) {
+            if (event.getUser().getIdLong() != listener.user) {
+                event.deferReply(true).addEmbeds(
+                        new PresetBuilder().withPreset(
+                                new InformativeReply(InformativeReplyType.ERROR, "You can't use this button!"))
+                                .getEmbed()
+                                .build()
+                ).queue();
+                return;
+            }
+            
+            BUTTON_CONSUMERS.expireKey(event.getMessageIdLong());
+            listener.consumer.accept(event);
+        }
+    }
+    
+    private record ButtonListener(long user, Consumer<ButtonInteractionEvent> consumer) {
+    
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/CommandAcceptor.java b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/CommandAcceptor.java
index a52ca15d..ba5c6805 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/CommandAcceptor.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/CommandAcceptor.java
@@ -1,6 +1,7 @@
 package com.diamondfire.helpbot.sys.message.acceptors;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.CommandHandler;
 import com.diamondfire.helpbot.bot.events.CommandEvent;
 import net.dv8tion.jda.api.entities.Message;
 
@@ -9,10 +10,15 @@ public class CommandAcceptor implements MessageAcceptor {
     @Override
     public boolean accept(Message message) {
         if (message.getContentDisplay().startsWith(HelpBotInstance.getConfig().getPrefix()) && !message.getAuthor().isBot()) {
-            HelpBotInstance.getHandler().run(new CommandEvent(message));
+            CommandEvent event = new CommandEvent(message);
+            if (event.getCommand() == null) {
+                return false;
+            }
+            
+            CommandHandler.getInstance().run(event);
             return true;
         }
         
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/FilterAcceptor.java b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/FilterAcceptor.java
index 72aa4f2d..8caae6aa 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/FilterAcceptor.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/FilterAcceptor.java
@@ -7,6 +7,6 @@ public class FilterAcceptor implements MessageAcceptor {
     
     @Override
     public boolean accept(Message message) {
-        return ChatFilters.filterMessage(message);
+        return !ChatFilters.filterMessage(message);
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/TagAcceptor.java b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/TagAcceptor.java
new file mode 100644
index 00000000..0f8a4700
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/TagAcceptor.java
@@ -0,0 +1,35 @@
+package com.diamondfire.helpbot.sys.message.acceptors;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.sys.tag.*;
+import com.diamondfire.helpbot.sys.tag.exceptions.TagDoesNotExistException;
+import net.dv8tion.jda.api.entities.Message;
+
+import java.io.IOException;
+
+public class TagAcceptor implements MessageAcceptor {
+    
+    @Override
+    public boolean accept(Message message) {
+        if (message.getContentDisplay().startsWith(HelpBotInstance.getConfig().getPrefix()) &&
+                !message.getAuthor().isBot()) {
+            
+            String parsedText = message.getContentStripped()
+                    .substring(HelpBotInstance.getConfig().getPrefix().length())
+                    .replaceFirst(" .*$", "");
+            
+            try {
+                // Get Tag and send response
+                TagHandler.getTag(parsedText)
+                        .sendResponse(message.getChannel().asGuildMessageChannel(), message.getAuthor());
+                
+            } catch (TagDoesNotExistException | IOException ignored) {
+                return false;
+            }
+            
+            return true;
+        }
+        
+        return false;
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/VerifyAcceptor.java b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/VerifyAcceptor.java
new file mode 100644
index 00000000..fbdc1f2f
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/message/acceptors/VerifyAcceptor.java
@@ -0,0 +1,73 @@
+package com.diamondfire.helpbot.sys.message.acceptors;
+
+import com.diamondfire.helpbot.bot.command.impl.other.mod.VerifyCommand;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
+import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
+import com.diamondfire.helpbot.util.Util;
+import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+
+import java.sql.ResultSet;
+
+public class VerifyAcceptor implements MessageAcceptor {
+    
+    @Override
+    public boolean accept(Message message) {
+        if (message.getChannel().getIdLong() != 422588582688063489L) {
+            return false;
+        }
+        
+        String contents = message.getContentRaw();
+        int start = contents.indexOf('#');
+        if (start == -1 || contents.length() < start + 6) {
+            return false;
+        }
+        
+        String key = contents.substring(start + 1, start + 6); // Remove #
+        new DatabaseQuery()
+                .query(new BasicQuery("SELECT * FROM hypercube.linked_accounts WHERE secret_key = ?", (statement) -> {
+                    statement.setString(1, key);
+                }))
+                .compile()
+                .run((result) -> {
+                    if (result.isEmpty()) {
+                        message.addReaction(Emoji.fromUnicode("❌")).queue();
+                    } else {
+                        ResultSet set = result.getResult();
+                        Member author = message.getMember();
+                        
+                        String uuid = set.getString("player_uuid");
+                        String name = set.getString("player_name");
+                        String userString = author.getId();
+                        
+                        Guild guild = message.getGuild();
+                        guild.addRoleToMember(message.getMember(), guild.getRoleById((VerifyCommand.ROLE_ID))).queue();
+                        
+                        // Run the query before any messages sent to make sure that they are actually added.
+                        new DatabaseQuery()
+                                .query(new BasicQuery("UPDATE linked_accounts SET discord_id = null WHERE discord_id = ? ", (statement) -> {
+                                    statement.setString(1, userString);
+                                })).compile();
+                        
+                        new DatabaseQuery()
+                                .query(new BasicQuery("INSERT INTO linked_accounts (player_uuid, player_name, discord_id) VALUES (?,?,?) ON DUPLICATE KEY UPDATE discord_id = ?", (statement) -> {
+                                    statement.setString(1, uuid);
+                                    statement.setString(2, name);
+                                    statement.setString(3, userString);
+                                    statement.setString(4, userString);
+                                })).compile();
+                        
+                        Util.updateMember(author);
+                        
+                        PresetBuilder log = new PresetBuilder()
+                                .withPreset(new InformativeReply(InformativeReplyType.SUCCESS, name + " was verified"));
+                        Util.log(log);
+                        message.delete().queue();
+                    }
+                });
+        
+        return false;
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/message/filter/filters/SwearFilter.java b/src/main/java/com/diamondfire/helpbot/sys/message/filter/filters/SwearFilter.java
index 91a5dbeb..7c381d92 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/message/filter/filters/SwearFilter.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/message/filter/filters/SwearFilter.java
@@ -67,12 +67,8 @@ public boolean filterString(String message, FilterData data) {
         
         // This is fairly easy to bypass, but still good to have
         String concatenated = getImplicit(message.replace(" ", ""));
-        
-        if (BLOCKED_MESSAGES.contains(concatenated)) {
-            return true;
-        }
-        
-        return false;
+
+        return BLOCKED_MESSAGES.contains(concatenated);
     }
     
     private static final HashMap<Character, Character> CHARACTER_MAP;
diff --git a/src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelector.java b/src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelector.java
new file mode 100644
index 00000000..344be8c4
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelector.java
@@ -0,0 +1,57 @@
+package com.diamondfire.helpbot.sys.multiselector;
+
+import com.diamondfire.helpbot.sys.interaction.button.ButtonHandler;
+import com.diamondfire.helpbot.util.Util;
+import net.dv8tion.jda.api.*;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+
+import java.util.*;
+
+public class MultiSelector {
+    
+    private final MultiSelectorPage[] pages;
+    private final long channel;
+    private final long user;
+    
+    public MultiSelector(long channel, long user, List<MultiSelectorPage> pages) {
+        this.pages = pages.toArray(new MultiSelectorPage[0]);
+        this.channel = channel;
+        this.user = user;
+    }
+    
+    public void send(JDA jda) {
+        for (MultiSelectorPage page : pages) {
+            EmbedBuilder pageBuilder = page.getPage();
+            pageBuilder.setTitle(page.getName());
+        }
+        
+        Map<String, MultiSelectorPage> pageMap = new HashMap<>(pages.length);
+        List<Button> buttons = new ArrayList<>();
+        for (MultiSelectorPage page : pages) {
+            if (page.isHidden()) {
+                continue;
+            }
+            
+            Button button = Button.secondary(getButtonKey(page), page.getName());
+            if (page.getCustomEmote() != null) {
+                button = button.withEmoji(Emoji.fromUnicode(page.getCustomEmote()));
+            }
+            
+            pageMap.put(button.getCustomId(), page);
+            buttons.add(button);
+        }
+        
+        jda.getTextChannelById(channel).sendMessageEmbeds(pages[0].getPage().build()).setComponents(ActionRow.of(buttons)).queue((message) -> {
+            ButtonHandler.addListener(user, message, event -> {
+                event.deferEdit().queue();
+                message.editMessageEmbeds(pageMap.get(event.getComponentId()).getPage().build()).setComponents(message.getComponents()).queue();
+            }, true);
+        });
+    }
+    
+    private String getButtonKey(MultiSelectorPage page) {
+        return page.getName() + "-BUTTON";
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelectorBuilder.java b/src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelectorBuilder.java
similarity index 96%
rename from src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelectorBuilder.java
rename to src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelectorBuilder.java
index 4781f4ab..729a0556 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelectorBuilder.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelectorBuilder.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.sys.reactions.multiselector;
+package com.diamondfire.helpbot.sys.multiselector;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import org.jetbrains.annotations.Contract;
diff --git a/src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelectorPage.java b/src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelectorPage.java
similarity index 94%
rename from src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelectorPage.java
rename to src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelectorPage.java
index a756b599..8494c1b6 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelectorPage.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelectorPage.java
@@ -1,4 +1,4 @@
-package com.diamondfire.helpbot.sys.reactions.multiselector;
+package com.diamondfire.helpbot.sys.multiselector;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 
diff --git a/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionHandler.java b/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionHandler.java
deleted file mode 100644
index 25bf519e..00000000
--- a/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionHandler.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.diamondfire.helpbot.sys.reactions.impl;
-
-import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.events.message.guild.react.GuildMessageReactionAddEvent;
-
-import java.util.HashMap;
-import java.util.concurrent.*;
-import java.util.function.Consumer;
-
-public class ReactionHandler {
-    
-    private static final HashMap<Long, ScheduledReactionTask> reactionWaitHashMap = new HashMap<>();
-    private static final ScheduledExecutorService service = Executors.newScheduledThreadPool(1);
-    
-    private static final int DELAY = 5;
-    private static final TimeUnit DELAY_UNIT = TimeUnit.MINUTES;
-    
-    public static void waitReaction(long user, Message message, Consumer<ReactionRespondEvent> responder) {
-        scheduleNew(new ReactionWait(message, user, responder));
-    }
-    
-    public static void waitReaction(long user, Message message, Consumer<ReactionRespondEvent> responder, boolean persistent) {
-        scheduleNew(new ReactionWait(message, user, responder, persistent));
-    }
-    
-    private static void scheduleNew(ReactionWait wait) {
-        long user = wait.getUser();
-        if (isWaiting(user)) {
-            ScheduledReactionTask scheduledWait = reactionWaitHashMap.get(user);
-            scheduledWait.getWait().run();
-            scheduledWait.getFuture().cancel(false);
-        }
-        
-        schedule(user, wait);
-    }
-    
-    private static void schedule(long user, ReactionWait wait) {
-        reactionWaitHashMap.put(user, new ScheduledReactionTask(service.schedule(wait, DELAY, DELAY_UNIT), wait));
-    }
-    
-    public static boolean isWaiting(long user) {
-        return reactionWaitHashMap.containsKey(user);
-    }
-    
-    public static boolean isMessageReserved(long message) {
-        for (ScheduledReactionTask wait : reactionWaitHashMap.values()) {
-            if (wait.getWait().getMessage().getIdLong() == message) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    public static void handleReaction(GuildMessageReactionAddEvent event) {
-        long messageID = event.getMessageIdLong();
-        User user = event.getUser();
-        ScheduledReactionTask task = reactionWaitHashMap.get(user.getIdLong());
-        ReactionWait reactionWait = task.getWait();
-        
-        if (reactionWait.getMessage().getIdLong() == messageID) {
-            reactionWait.getResponder().accept(new ReactionRespondEvent(reactionWait, event.getReaction()));
-            
-            if (reactionWait.isPersistent()) {
-                task.getFuture().cancel(false);
-                schedule(reactionWait.getUser(), reactionWait);
-            } else {
-                task.getFuture().cancel(true);
-            }
-        }
-    }
-    
-    private static class ScheduledReactionTask {
-        
-        private final ScheduledFuture<?> future;
-        private final ReactionWait wait;
-        
-        public ScheduledReactionTask(ScheduledFuture<?> future, ReactionWait wait) {
-            this.future = future;
-            this.wait = wait;
-        }
-        
-        public ScheduledFuture<?> getFuture() {
-            return future;
-        }
-        
-        public ReactionWait getWait() {
-            return wait;
-        }
-    }
-    
-}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionRespondEvent.java b/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionRespondEvent.java
deleted file mode 100644
index ee8d72c4..00000000
--- a/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionRespondEvent.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.diamondfire.helpbot.sys.reactions.impl;
-
-import net.dv8tion.jda.api.entities.MessageReaction;
-
-public class ReactionRespondEvent {
-    
-    private final ReactionWait wait;
-    private final MessageReaction event;
-    
-    public ReactionRespondEvent(ReactionWait wait, MessageReaction event) {
-        this.wait = wait;
-        this.event = event;
-    }
-    
-    public ReactionWait getReactionWait() {
-        return wait;
-    }
-    
-    public MessageReaction getReactionEvent() {
-        return event;
-    }
-}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionWait.java b/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionWait.java
deleted file mode 100644
index eea82dd5..00000000
--- a/src/main/java/com/diamondfire/helpbot/sys/reactions/impl/ReactionWait.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.diamondfire.helpbot.sys.reactions.impl;
-
-import net.dv8tion.jda.api.entities.Message;
-
-import java.util.function.Consumer;
-
-public class ReactionWait implements Runnable {
-    
-    private final long user;
-    private final Message message;
-    private final Consumer<ReactionRespondEvent> responder;
-    private final boolean persistent;
-    
-    public ReactionWait(Message message, long user, Consumer<ReactionRespondEvent> responder) {
-        this.message = message;
-        this.user = user;
-        this.responder = responder;
-        this.persistent = false;
-    }
-    
-    
-    public ReactionWait(Message message, long user, Consumer<ReactionRespondEvent> responder, boolean persistent) {
-        this.message = message;
-        this.user = user;
-        this.responder = responder;
-        this.persistent = persistent;
-    }
-    
-    @Override
-    public void run() {
-        message.clearReactions().queue();
-    }
-    
-    public long getUser() {
-        return user;
-    }
-    
-    public Message getMessage() {
-        return message;
-    }
-    
-    public Consumer<ReactionRespondEvent> getResponder() {
-        return responder;
-    }
-    
-    public boolean isPersistent() {
-        return persistent;
-    }
-    
-}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelector.java b/src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelector.java
deleted file mode 100644
index 28d3b6bd..00000000
--- a/src/main/java/com/diamondfire/helpbot/sys/reactions/multiselector/MultiSelector.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.diamondfire.helpbot.sys.reactions.multiselector;
-
-import com.diamondfire.helpbot.df.codeinfo.viewables.BasicReaction;
-import com.diamondfire.helpbot.sys.reactions.impl.ReactionHandler;
-import com.diamondfire.helpbot.util.*;
-import net.dv8tion.jda.api.*;
-import net.dv8tion.jda.api.entities.MessageReaction;
-
-import java.util.*;
-
-public class MultiSelector {
-    
-    private final MultiSelectorPage[] pages;
-    private final long channel;
-    private final long user;
-    
-    public MultiSelector(long channel, long user, List<MultiSelectorPage> pages) {
-        this.pages = pages.toArray(new MultiSelectorPage[0]);
-        this.channel = channel;
-        this.user = user;
-    }
-    
-    public void send(JDA jda) {
-        List<String> emojis = new ArrayList<>();
-        Deque<String> nums = Util.getUnicodeNumbers();
-        LinkedHashMap<BasicReaction, MultiSelectorPage> pagesHash = new LinkedHashMap<>();
-        
-        for (MultiSelectorPage page : pages) {
-            if (page.isHidden()) {
-                continue;
-            }
-            if (nums.isEmpty()) {
-                throw new IllegalStateException("Not enough emojis to map 10 objects!");
-            }
-            
-            String emoji = page.getCustomEmote() != null ? page.getCustomEmote() : nums.pop();
-            
-            emojis.add(emoji + " " + page.getName());
-            pagesHash.put(new BasicReaction(emoji), page);
-        }
-        
-        for (MultiSelectorPage page : pages) {
-            EmbedBuilder pageBuilder = page.getPage();
-            pageBuilder.setTitle(page.getName());
-            EmbedUtil.addFields(pageBuilder, emojis, "", "Pages");
-        }
-        
-        jda.getTextChannelById(channel).sendMessage(pages[0].getPage().build()).queue((message) -> {
-            for (BasicReaction reaction : pagesHash.keySet()) {
-                reaction.react(message).queue();
-            }
-            
-            ReactionHandler.waitReaction(user, message, event -> {
-                MessageReaction reactionEvent = event.getReactionEvent();
-                MultiSelectorPage page = null;
-                for (Map.Entry<BasicReaction, MultiSelectorPage> selectorPage : pagesHash.entrySet()) {
-                    if (selectorPage.getKey().equalToReaction(reactionEvent.getReactionEmote())) {
-                        page = selectorPage.getValue();
-                        break;
-                    }
-                }
-                
-                jda.retrieveUserById(user).queue(userObj -> reactionEvent.removeReaction(userObj).queue());
-                message.editMessage(page.getPage().build()).queue();
-            }, true);
-        });
-    }
-}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/report/ReportListener.java b/src/main/java/com/diamondfire/helpbot/sys/report/ReportListener.java
new file mode 100644
index 00000000..e828ac97
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/report/ReportListener.java
@@ -0,0 +1,192 @@
+package com.diamondfire.helpbot.sys.report;
+
+import club.minnced.discord.webhook.WebhookClient;
+import club.minnced.discord.webhook.external.JDAWebhookClient;
+import club.minnced.discord.webhook.send.*;
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.util.*;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.attachmentupload.AttachmentUpload;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.components.label.Label;
+import net.dv8tion.jda.api.components.textdisplay.TextDisplay;
+import net.dv8tion.jda.api.components.textinput.*;
+import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.interactions.modals.*;
+import net.dv8tion.jda.api.modals.Modal;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.net.URL;
+import java.util.*;
+import java.util.List;
+import java.util.concurrent.*;
+
+public class ReportListener extends ListenerAdapter {
+    
+    private static final ExecutorService SERVICE = Executors.newCachedThreadPool();
+    
+    private static final long MESSAGE_ID = 1433051440410136659L;
+    private static final long CHANNEL_ID = 849769323166040124L;
+    private static final long NO_REPORTS_ROLE_ID = 345024090211483648L;
+    
+    private static final String BUTTON_ID = "create-report";
+    private static final String USERNAME_FIELD_ID = "username";
+    private static final String RULE_BROKEN_FIELD_ID = "rule-broken";
+    private static final String PROOF_FIELD_ID = "proof";
+    private static final String REPORT_MODAL_FIELD_ID = "report";
+    
+    public ReportListener() {
+        if (HelpBotInstance.getConfig().isDevBot()) {
+            return;
+        }
+        
+        HelpBotInstance.getJda().getTextChannelById(CHANNEL_ID).retrieveMessageById(MESSAGE_ID).queue((msg) -> {
+            
+            Button button = Button.secondary(BUTTON_ID, "Create Report")
+                            .withEmoji(Emoji.fromUnicode("\uD83D\uDEA9")); // 🚩
+            
+            EmbedBuilder embed = new EmbedBuilder();
+            embed.setTitle("Reporting");
+            embed.setDescription("""
+                        Welcome to the reports channel! This is the place where you report rulebreakers. Before you get to that, let's lay down the rules.
+                        
+                        1. Use your common sense - don't break server rules.
+                        2. Only report a player if they have legitimately broken a rule.
+                        3. Do not make joke reports.
+                        
+                        Breaking these rules may result in the inability to post reports to the reports channel, restricted permissions on Discord, or a Discord server mute.
+                        """);
+            embed.setColor(0x05E076);
+            
+            msg.editMessage("")
+                    .setEmbeds(List.of(
+                        embed.build()
+                    ))
+                    .setComponents(ActionRow.of(button))
+                    .queue();
+        });
+    }
+    
+    
+    @Override
+    public void onButtonInteraction(@NotNull ButtonInteractionEvent event) {
+        if (!BUTTON_ID.equals(event.getComponentId())) {
+            return;
+        }
+        
+        Member member = event.getMember();
+        if (member.getRoles().contains(event.getGuild().getRoleById(NO_REPORTS_ROLE_ID))) {
+            event.reply(":x: You're currently blocked from making reports").setEphemeral(true).queue();
+            return;
+        }
+        
+        /*
+        Username of rule breaker:
+        Rule broken:
+        Proof (uncropped screenshot):
+         */
+        
+        TextDisplay body = TextDisplay.of("""
+                **Thank you for helping keep DiamondFire safe!**
+                * Multiple proofs are allowed.
+                * Proofs can be both **videos and screenshots**.
+                * Uploaded screenshots should be **uncropped**
+                > Meaning, take a __full screenshot__ of your screen.
+                * Make sure reports are made in **good faith with valid proof**.
+                """);
+        
+        TextInput username = TextInput.create(USERNAME_FIELD_ID, TextInputStyle.SHORT)
+                .setPlaceholder("Minecraft Username")
+                .setRequiredRange(3, 16)
+                .setRequired(true)
+                .build();
+        
+        TextInput ruleBroken = TextInput.create(RULE_BROKEN_FIELD_ID, TextInputStyle.PARAGRAPH)
+                .setPlaceholder("Which rule did they break?")
+                .setRequired(true)
+                .build();
+        
+        AttachmentUpload proof = AttachmentUpload.create(PROOF_FIELD_ID)
+                .setMinValues(1)
+                .setMaxValues(10)
+                .setRequired(true)
+                .build();
+        
+        Modal modal = Modal.create(REPORT_MODAL_FIELD_ID, "Report")
+                .addComponents(body, Label.of("Username of Rule Breaker", username), Label.of("Rule Broken", ruleBroken), Label.of("Proof (uncropped)", proof))
+                .build();
+        
+        event.replyModal(modal).queue();
+    }
+    
+    
+    @Override
+    public void onModalInteraction(ModalInteractionEvent event) {
+        if (!REPORT_MODAL_FIELD_ID.equals(event.getModalId())) {
+            return;
+        }
+        
+        String username = getValue(event, USERNAME_FIELD_ID).getAsString();
+        String message = getValue(event, RULE_BROKEN_FIELD_ID).getAsString();
+        List<Message.Attachment> proofs = getValue(event, PROOF_FIELD_ID).getAsAttachmentList();
+        
+        final var webhookUrl = HelpBotInstance.getConfig().getForwardingChannels().get("" + CHANNEL_ID);
+        if (webhookUrl == null) {
+            event.reply(":x: Internal error").queue();
+        }
+        
+        SERVICE.submit(() -> {
+            try (WebhookClient client = JDAWebhookClient.withUrl(webhookUrl.getAsString())) {
+                boolean tooLong = message.length() > 2000;
+                String content = tooLong ? "See content.txt for message (too long)" : message;
+                
+                WebhookMessageBuilder builder = new WebhookMessageBuilder()
+                        .setContent(String.format("""
+                                **Offender**: %s
+                                **Rule Broken**:
+                                %s
+                                """, username, content))
+                        .setAllowedMentions(AllowedMentions.none())
+                        .setUsername(event.getMember().getEffectiveName())
+                        .setAvatarUrl(event.getUser().getEffectiveAvatarUrl());
+                
+                for (Message.Attachment attachment : proofs) {
+                    URL url = new URL(attachment.getProxyUrl());
+                    builder.addFile(attachment.getFileName(), url.openStream().readAllBytes());
+                }
+                if (tooLong) {
+                    builder.addFile("content.txt", message.getBytes());
+                }
+                
+                System.out.println("Sending to webhook");
+                client.send(builder.build()).whenComplete((msg, exception) -> {
+                    if (exception != null) exception.printStackTrace();
+                    if (exception != null) {
+                        event.reply(":x: Uh oh! An error occurred while submitting your report. Please try resending it later.").setEphemeral(true).queue();
+                    } else {
+                        event.reply(":mega: Your report has been successfully submitted!").setEphemeral(true).queue();
+                    }
+                });
+            } catch (Throwable ignored) {
+                ignored.printStackTrace();
+            }
+        });
+        
+    }
+    
+    private ModalMapping getValue(ModalInteraction event, String customId) {
+        // Instead of event#getValue since it returns null when not found,
+        // we just assume the components always exist as we already confirm
+        // it's the report modal.
+        return event.getValues().stream()
+                .filter(mapping -> mapping.getCustomId().equals(customId))
+                .findFirst().orElseThrow();
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/rolereact/ReactRole.java b/src/main/java/com/diamondfire/helpbot/sys/rolereact/ReactRole.java
index 1b31ebe1..c478d89c 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/rolereact/ReactRole.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/rolereact/ReactRole.java
@@ -8,7 +8,9 @@ public enum ReactRole {
     STREAMS("\uD83D\uDDA5", 761779390161223681L),
     PROMOTIONS("\uD83D\uDC64", 761779521937735711L),
     SALES("\uD83C\uDFF7", 761779623322320916L),
-    APP_UPDATES("\uD83D\uDCD4", 770062219362435113L, "Application Updates");
+    APP_UPDATES("\uD83D\uDCD4", 770062219362435113L, "Staff Applications"),
+    MEDIA("\uD83D\uDCF7", 821811669918416897L),
+    POLLS("\uD83D\uDCCA", 995746459964166154L);
     
     private static final Map<String, ReactRole> roleMap = new HashMap<>();
     private final String emoji;
diff --git a/src/main/java/com/diamondfire/helpbot/sys/rolereact/RoleReactListener.java b/src/main/java/com/diamondfire/helpbot/sys/rolereact/RoleReactListener.java
index e8c487a9..959b99b7 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/rolereact/RoleReactListener.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/rolereact/RoleReactListener.java
@@ -1,12 +1,16 @@
 package com.diamondfire.helpbot.sys.rolereact;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
-import com.diamondfire.helpbot.util.StringUtil;
+import com.diamondfire.helpbot.util.*;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.events.message.guild.react.*;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.interactions.components.buttons.*;
+import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
+import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
 import java.util.*;
 
 public class RoleReactListener extends ListenerAdapter {
@@ -14,6 +18,8 @@ public class RoleReactListener extends ListenerAdapter {
     private static final long MESSAGE_ID = 762167137775124491L;
     private static final long CHANNEL_ID = 762158470019022858L;
     
+    private static final Map<String, Long> roleMap = new HashMap<>();
+    
     public RoleReactListener() {
         if (HelpBotInstance.getConfig().isDevBot()) {
             return;
@@ -21,85 +27,41 @@ public RoleReactListener() {
         
         HelpBotInstance.getJda().getTextChannelById(CHANNEL_ID).retrieveMessageById(MESSAGE_ID).queue((msg) -> {
             
-            for (MessageReaction reaction : msg.getReactions()) {
-                if (ReactRole.fromEmoji(reaction.getReactionEmote().getEmoji()) == null) {
-                    reaction.clearReactions().queue();
-                }
-            }
-            
-            List<String> emojis = new ArrayList<>();
+            List<Button> buttons = new ArrayList<>();
             for (ReactRole role : ReactRole.values()) {
                 String emoji = role.getEmoji();
-                msg.addReaction(emoji).queue();
+                Button button = Button.secondary(role.name(), role.getOverride() == null ? StringUtil.smartCaps(role.name().replace('_', ' ')) : role.getOverride());
                 
-                String message;
-                if (role.getOverride() == null) {
-                    message = StringUtil.smartCaps(role.name().replace('_', ' '));
-                } else {
-                    message = role.getOverride();
-                }
-                
-                emojis.add(emoji + " " + String.format("``%s``", message));
+                buttons.add(button.withEmoji(Emoji.fromUnicode(emoji)));
+                roleMap.put(button.getCustomId(), role.getRoleID());
             }
             
-            msg.editMessage("__**Reaction Roles**__ \nReact with any of the following to receive pings regarding that topic.\n" + StringUtil.listView("", emojis)).queue();
+            msg.editMessage("__**Reaction Roles**__ \nClick to add/remove roles from yourself")
+                    .setComponents(Util.of(buttons))
+                    .queue();
         });
     }
     
-    @Override
-    public void onGuildMessageReactionAdd(@Nonnull GuildMessageReactionAddEvent event) {
-        if (event.getUser().isBot()) return;
-        
-        try {
-            Role role = genericReact(event);
-            
-            event.getGuild().addRoleToMember(event.getUserIdLong(), role).reason("User subscribed to announcement!").queue();
-        } catch (IllegalStateException ignored) {
-        }
-    }
     
     @Override
-    public void onGuildMessageReactionRemove(@Nonnull GuildMessageReactionRemoveEvent event) {
-        try {
-            Role role = genericReact(event);
-            
-            event.getGuild().removeRoleFromMember(event.getUserIdLong(), role).reason("User unsubscribed from announcement!").queue();
-        } catch (IllegalStateException ignored) {
+    public void onButtonInteraction(@NotNull ButtonInteractionEvent event) {
+        if (!roleMap.containsKey(event.getComponentId())) {
+            return;
         }
-    }
-    
-    private Role genericReact(GenericGuildMessageReactionEvent reactionEvent) throws IllegalStateException {
-        MessageReaction.ReactionEmote emote = reactionEvent.getReactionEmote();
-        Guild guild = reactionEvent.getGuild();
-        if (reactionEvent.getMessageIdLong() == MESSAGE_ID && emote.isEmoji() && !HelpBotInstance.getConfig().isDevBot()) {
-            ReactRole role = ReactRole.fromEmoji(emote.getEmoji());
-            if (role == null) {
-                return null;
-            }
-            
-            return guild.getRoleById(role.getRoleID());
+        
+        long role = roleMap.get(event.getComponentId());
+        Guild guild = event.getGuild();
+        Role guildRole = event.getGuild().getRoleById(role);
+        Member member = event.getMember();
+        
+        ReplyCallbackAction action = event.deferReply(true);
+        if (member.getRoles().contains(guildRole)) {
+            action.setContent("Removed the " + guildRole.getAsMention() + " role from you!");
+            guild.removeRoleFromMember(UserSnowflake.fromId(member.getIdLong()), guildRole).reason("User unsubscribed to announcement!").queue();
         } else {
-            throw new IllegalStateException();
+            action.setContent("Added the " + guildRole.getAsMention() + " role to you!");
+            guild.addRoleToMember(UserSnowflake.fromId(member.getIdLong()), guildRole).reason("User subscribed to announcement!").queue();
         }
-        
+        action.queue();
     }
-    
-    public static void refreshRoles(Member member) throws IllegalStateException {
-        HelpBotInstance.getJda().getTextChannelById(CHANNEL_ID).retrieveMessageById(MESSAGE_ID).queue((msg) -> {
-            for (MessageReaction reactionEmote : msg.getReactions()) {
-                reactionEmote.retrieveUsers()
-                        .cache(false)
-                        .forEachAsync((user) -> {
-                            if (user.getIdLong() == member.getIdLong()) {
-                                ReactRole role = ReactRole.fromEmoji(reactionEmote.getReactionEmote().getEmoji());
-                                
-                                member.getGuild().addRoleToMember(member, member.getGuild().getRoleById(role.getRoleID())).queue();
-                                return false;
-                            }
-                            return true;
-                        });
-            }
-        });
-    }
-    
 }
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java b/src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java
new file mode 100644
index 00000000..3e19d0ac
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java
@@ -0,0 +1,89 @@
+package com.diamondfire.helpbot.sys.tag;
+
+import com.diamondfire.helpbot.util.serializer.TagSerializer;
+import com.google.gson.JsonObject;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.Serializable;
+
+public class Tag implements Serializable {
+    
+    private String activator;
+    private String title;
+    private String response;
+    private long authorId;
+    private String image;
+    
+    public Tag(String activator, String title, String response, long authorId, String image) {
+        this.activator = activator;
+        this.title = title;
+        this.response = response;
+        this.authorId = authorId;
+        this.image = image;
+    }
+    
+    public String getActivator() {
+        return activator;
+    }
+    
+    public void setActivator(String activator) {
+        this.activator = activator.replaceAll(" ", "");
+    }
+    
+    public String getTitle() {
+        return title;
+    }
+    
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    
+    public String getResponse() {
+        return response;
+    }
+    
+    public void setResponse(String response) {
+        response = response.replace("\\n", "\n");
+        this.response = response;
+    }
+    
+    public long getAuthorId() {
+        return authorId;
+    }
+    
+    public void setAuthorId(long authorId) {
+        this.authorId = authorId;
+    }
+    
+    public String getImage() {
+        return image;
+    }
+    
+    public void setImage(String image) {
+        this.image = image;
+    }
+    
+    public void sendResponse(GuildMessageChannel channel, @NotNull User requester) {
+        
+        EmbedBuilder embed = new EmbedBuilder()
+                .setTitle(getTitle())
+                .setDescription(getResponse() + "\n\u200b")
+                .setColor(0x969dba)
+                .setFooter("Executed by " + requester.getName(), requester.getAvatarUrl());
+        
+        if (!getImage().isEmpty()) {
+            embed.setImage(getImage());
+        }
+                
+        channel.sendMessageEmbeds(embed.build()).queue();
+    }
+    
+    public JsonObject serialize() {
+        return TagSerializer.getInstance().serialize(this);
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tag/TagHandler.java b/src/main/java/com/diamondfire/helpbot/sys/tag/TagHandler.java
new file mode 100644
index 00000000..e565cbab
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/tag/TagHandler.java
@@ -0,0 +1,102 @@
+package com.diamondfire.helpbot.sys.tag;
+
+import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
+import com.diamondfire.helpbot.sys.tag.exceptions.*;
+import com.diamondfire.helpbot.util.serializer.*;
+import com.google.gson.*;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.*;
+import java.nio.file.*;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class TagHandler {
+    
+    private static final List<Tag> TAGS = new ArrayList<>();
+    private static final File FILE = ExternalFiles.TAGS;
+    
+    static {
+        try {
+            cacheJson();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public static List<Tag> getTags() {
+        return TAGS;
+    }
+    
+    public static void cacheJson() throws IOException {
+        // Read the file and update the cache
+        String content = new String(Files.readAllBytes(FILE.toPath()));
+        
+        if (content.isEmpty()) {
+            content = "{}";
+        }
+        
+        JsonObject obj = JsonParser.parseString(content).getAsJsonObject();
+        
+        for (String key : obj.keySet()) {
+            TAGS.add(TagSerializer.getInstance().deserialize(
+                    obj.get(key).getAsJsonObject()
+            ));
+        }
+    }
+    
+    public static void save() throws IOException {
+        JsonObject json = new JsonObject();
+        
+        for (Tag tag : TAGS) {
+            json.add(tag.getActivator(), tag.serialize());
+        }
+    
+        FILE.delete();
+        FILE.createNewFile();
+        Files.write(FILE.toPath(), json.toString().getBytes(), StandardOpenOption.WRITE);
+    }
+    
+    public static void newTag(Tag tag) throws TagAlreadyExistsException, IOException {
+        // Check if tag with equal activator already exists
+        if (TAGS.stream().anyMatch(t -> t.getActivator().equals(tag.getActivator()))) {
+            throw new TagAlreadyExistsException("A tag with this activator already exists.");
+        }
+        
+        // Add the new tag
+        TAGS.add(tag);
+        save();
+    }
+    
+    public static void deleteTag(String activator) throws TagDoesNotExistException, IOException {
+        // Get tag + check if it exists
+        Tag tag = getTag(activator);
+        
+        // Remove the tag
+        TAGS.remove(tag);
+        save();
+    }
+    
+    public static void deleteTag(Tag tag) throws TagDoesNotExistException, IOException {
+        deleteTag(tag.getActivator());
+    }
+    
+    public static @NotNull Tag getTag(String activator) throws TagDoesNotExistException, IOException {
+        if (TAGS.isEmpty()) {
+            throw new TagDoesNotExistException("Empty");
+        }
+        
+        Tag tag = TAGS.stream()
+                .filter(t -> t.getActivator().equals(activator))
+                .collect(Collectors.toList())
+                .get(0);
+        
+        if (tag == null) {
+            throw new TagDoesNotExistException(String.format(
+                    "A tag with activator `%s` does not exist.", activator));
+        }
+        
+        return tag;
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagAlreadyExistsException.java b/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagAlreadyExistsException.java
new file mode 100644
index 00000000..256caf1d
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagAlreadyExistsException.java
@@ -0,0 +1,9 @@
+package com.diamondfire.helpbot.sys.tag.exceptions;
+
+public class TagAlreadyExistsException extends Exception {
+    
+    public TagAlreadyExistsException(String message) {
+        super(message);
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagDoesNotExistException.java b/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagDoesNotExistException.java
new file mode 100644
index 00000000..a35a2f6a
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagDoesNotExistException.java
@@ -0,0 +1,9 @@
+package com.diamondfire.helpbot.sys.tag.exceptions;
+
+public class TagDoesNotExistException extends TagException {
+    
+    public TagDoesNotExistException(String message) {
+        super(message);
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagException.java b/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagException.java
new file mode 100644
index 00000000..50cbb39b
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/tag/exceptions/TagException.java
@@ -0,0 +1,9 @@
+package com.diamondfire.helpbot.sys.tag.exceptions;
+
+public class TagException extends Exception {
+    
+    public TagException(String message) {
+        super(message);
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/LoopingTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/LoopingTask.java
index 0c7a98ba..fb83401a 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/LoopingTask.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/LoopingTask.java
@@ -1,7 +1,7 @@
 package com.diamondfire.helpbot.sys.tasks;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 
 public interface LoopingTask extends Runnable {
     
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/MidnightTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/MidnightTask.java
index 2533e2fa..73017f03 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/MidnightTask.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/MidnightTask.java
@@ -1,7 +1,6 @@
 package com.diamondfire.helpbot.sys.tasks;
 
 import java.time.*;
-import java.time.chrono.ChronoLocalDateTime;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/TaskRegistry.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/TaskRegistry.java
index af13d2b0..2959bede 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/TaskRegistry.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/TaskRegistry.java
@@ -13,11 +13,12 @@ public void initialize() {
         if (HelpBotInstance.getConfig().isDevBot()) return;
         
         register(
-                new CodeDatabaseTask(),
+                //new CodeDatabaseTask(),
                 new GraphChannelTask(),
-                new RefreshCreditsTask(),
+                //new RefreshCreditsTask(),
                 new SupporterClassTask(),
-                new NameUpdateTask()
+                new NameUpdateTask(),
+                new VIPStarTask()
         );
         
         SupportUnexcuseTask.prepare();
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/CodeDatabaseTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/CodeDatabaseTask.java
index 6acea964..20b2b007 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/CodeDatabaseTask.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/CodeDatabaseTask.java
@@ -1,6 +1,6 @@
 package com.diamondfire.helpbot.sys.tasks.impl;
 
-import com.diamondfire.helpbot.bot.command.impl.other.FetchDataCommand;
+import com.diamondfire.helpbot.bot.command.impl.other.dev.FetchDataCommand;
 import com.diamondfire.helpbot.sys.tasks.MidnightTask;
 
 public class CodeDatabaseTask implements MidnightTask {
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/GraphChannelTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/GraphChannelTask.java
index 62182dfd..caf74175 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/GraphChannelTask.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/GraphChannelTask.java
@@ -1,11 +1,11 @@
 package com.diamondfire.helpbot.sys.tasks.impl;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
-import com.diamondfire.helpbot.bot.command.impl.stats.graph.*;
 import com.diamondfire.helpbot.sys.graph.generators.*;
 import com.diamondfire.helpbot.sys.graph.generators.context.TimeGraphContext;
 import com.diamondfire.helpbot.sys.tasks.MidnightTask;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.utils.FileUpload;
 
 public class GraphChannelTask implements MidnightTask {
     
@@ -15,7 +15,7 @@ public void run() {
         channel.getHistoryFromBeginning(50).queue(messageHistory -> channel.purgeMessages(messageHistory.getRetrievedHistory()));
     
         TimeGraphContext context = new TimeGraphContext(TimeMode.DAILY, 14);
-        channel.sendFile(GraphGenerators.NEW_PLAYERS.createGraph(context)).queue();
-        channel.sendFile(GraphGenerators.UNIQUE_JOINS.createGraph(context)).queue();
+        channel.sendFiles(FileUpload.fromData(GraphGenerators.NEW_PLAYERS.createGraph(context))).queue();
+        channel.sendFiles(FileUpload.fromData(GraphGenerators.UNIQUE_JOINS.createGraph(context))).queue();
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/MuteExpireTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/MuteExpireTask.java
index 458b800d..41213885 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/MuteExpireTask.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/MuteExpireTask.java
@@ -1,11 +1,12 @@
 package com.diamondfire.helpbot.sys.tasks.impl;
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
-import com.diamondfire.helpbot.bot.command.impl.other.*;
+import com.diamondfire.helpbot.bot.command.impl.other.mod.*;
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.tasks.OneTimeTask;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 
 import java.sql.*;
 import java.time.*;
@@ -15,18 +16,10 @@ public class MuteExpireTask implements OneTimeTask {
     
     private final long ms;
     private final long member;
-    private final boolean discussionMute;
     
     public MuteExpireTask(long member, Date date) {
         this.ms = Duration.between(Instant.now(), date.toInstant()).toMillis();
         this.member = member;
-        this.discussionMute = false;
-    }
-    
-    public MuteExpireTask(long member, Date date, boolean discussionMute) {
-        this.ms = Duration.between(Instant.now(), date.toInstant()).toMillis();
-        this.member = member;
-        this.discussionMute = discussionMute;
     }
     
     @Override
@@ -38,15 +31,7 @@ public long getExecution() {
     public void run() {
         Guild guild = HelpBotInstance.getJda().getGuildById(HelpBotInstance.DF_GUILD);
         
-        if (discussionMute) {
-            TextChannel channel = guild.getTextChannelById(DiscussionMuteCommand.DISCUSSION_CHANNEL);
-            guild.retrieveMemberById(member).queue((member) -> {
-                channel.getPermissionOverride(member).delete().queue();
-            });
-            
-        } else {
-            guild.removeRoleFromMember(member, guild.getRoleById(MuteCommand.ROLE_ID)).queue();
-        }
+        guild.removeRoleFromMember(UserSnowflake.fromId(member), guild.getRoleById(MuteCommand.ROLE_ID)).queue();
         
         new DatabaseQuery()
                 .query(new BasicQuery("UPDATE owen.muted_members SET handled = true WHERE member = ?", (statement) -> statement.setLong(1, member)))
@@ -62,9 +47,8 @@ public static void prepare() {
                     for (ResultSet set : result) {
                         Timestamp date = set.getTimestamp("muted_till");
                         long member = set.getLong("member");
-                        boolean special = "Weekly Discussion Mute".equals(set.getString("reason"));
-                        
-                        HelpBotInstance.getScheduler().schedule(new MuteExpireTask(member, date, special));
+                       
+                        HelpBotInstance.getScheduler().schedule(new MuteExpireTask(member, date));
                     }
                 });
     }
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/RefreshCreditsTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/RefreshCreditsTask.java
index 3bd36086..0e02a101 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/RefreshCreditsTask.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/RefreshCreditsTask.java
@@ -12,7 +12,7 @@ public class RefreshCreditsTask implements MidnightTask {
     public void run() {
         PresetBuilder preset = new PresetBuilder();
         preset.withPreset(new InformativeReply(InformativeReplyType.INFO, "Credit log db has been updated"));
-        RESPONSE_CHANNEL.sendMessage(preset.getEmbed().build()).queue();
+        RESPONSE_CHANNEL.sendMessageEmbeds(preset.getEmbed().build()).queue();
         
         new DatabaseQuery()
                 .query(new BasicQuery("INSERT INTO owen.creator_rankings_log(uuid, points, `rank`, date) " +
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java
index 65d62c04..c2fb7dba 100644
--- a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java
@@ -10,7 +10,7 @@
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.tasks.OneTimeTask;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 
 import java.sql.ResultSet;
 import java.time.*;
@@ -18,7 +18,7 @@
 
 public class SupportUnexcuseTask implements OneTimeTask {
     
-    private static final long EXPERT_CHAT = 467729470539694091L;
+    private static final long SR_HELPER_CHAT = 467729470539694091L;
     private static final Command[] commandsToRun = new Command[]{
             new StatsCommand(),
             new LastJoinedCommand(),
@@ -41,7 +41,7 @@ public long getExecution() {
     @Override
     public void run() {
         PresetBuilder builder = new PresetBuilder();
-        TextChannel channel = HelpBotInstance.getJda().getTextChannelById(EXPERT_CHAT);
+        TextChannel channel = HelpBotInstance.getJda().getTextChannelById(SR_HELPER_CHAT);
         
         new DatabaseQuery()
                 .query(new BasicQuery("SELECT * FROM players WHERE players.uuid = ?", (statement) -> statement.setString(1, uuid)))
@@ -56,7 +56,7 @@ public void run() {
                     );
                     embed.setTitle(String.format("Excuse has expired! (%s day duration)", Duration.between(initDate.toInstant(), Instant.now()).toDays()));
                     
-                    channel.sendMessage(embed.build()).queue();
+                    channel.sendMessageEmbeds(embed.build()).queue();
                     
                     new DatabaseQuery()
                             .query(new BasicQuery("UPDATE owen.excused_staff SET handled = true WHERE uuid = ?", (statement) -> statement.setString(1, uuid)))
@@ -80,7 +80,7 @@ public static void prepare() {
                         "       reason " +
                         "FROM owen.excused_staff " +
                         "LEFT JOIN ranks r ON excused_staff.uuid = r.uuid " +
-                        "WHERE (support > 0 || moderation > 0) AND (excused_till > CURRENT_TIMESTAMP() || !handled) " +
+                        "WHERE (support > 0 || moderation > 0) AND handled = false " +
                         "ORDER BY excused_till DESC;"))
                 .compile()
                 .run((result) -> {
diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/VIPStarTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/VIPStarTask.java
new file mode 100644
index 00000000..93207b64
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/VIPStarTask.java
@@ -0,0 +1,51 @@
+package com.diamondfire.helpbot.sys.tasks.impl;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.sys.tasks.LoopingTask;
+import com.diamondfire.helpbot.sys.vip.VIPRoleHandler;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public class VIPStarTask implements LoopingTask {
+    
+    @Override
+    public long getInitialStart() {
+        return 0;
+    }
+    
+    @Override
+    public long getNextLoop() {
+        return TimeUnit.MINUTES.toMillis(30L);
+    }
+    
+    @Override
+    public void run() {
+        Guild guild = HelpBotInstance.getJda().getGuildById(HelpBotInstance.DF_GUILD);
+        Set<Long> vipIds = VIPRoleHandler.retrieveVIPs();
+
+        guild.loadMembers((member) -> {
+            Role role = VIPRoleHandler.getRole(member.getColorRaw());
+            if (role == null) {
+                return;
+            }
+            if (vipIds.contains(member.getIdLong()) && !member.getRoles().contains(role)) {
+                guild.addRoleToMember(member, role)
+                        .reason("User has VIP Pass")
+                        .queue();
+                return;
+            }
+            if (!vipIds.contains(member.getIdLong()) && member.getRoles().contains(role)) {
+                guild.removeRoleFromMember(member, role)
+                        .reason("User's VIP Pass has expired")
+                        .queue();
+            }
+        });
+
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/sys/vip/VIPRoleHandler.java b/src/main/java/com/diamondfire/helpbot/sys/vip/VIPRoleHandler.java
new file mode 100644
index 00000000..2743407f
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/sys/vip/VIPRoleHandler.java
@@ -0,0 +1,114 @@
+package com.diamondfire.helpbot.sys.vip;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
+import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
+import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
+import com.diamondfire.helpbot.util.StarUtil;
+import com.google.gson.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Icon;
+import net.dv8tion.jda.api.entities.Role;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
+import java.sql.ResultSet;
+import java.util.*;
+
+public class VIPRoleHandler {
+
+    private static final String ROLE_NAME = "VIP";
+    
+    private static final File FILE = ExternalFiles.VIP_ROLES;
+    private static final Map<Integer, Long> COLOR_ROLE_MAP = new HashMap<>();
+
+    static {
+        try {
+            cacheJson();
+            
+            Guild guild = HelpBotInstance.getJda().getGuildById(HelpBotInstance.DF_GUILD);
+            for (Role role : guild.getRoles()) {
+                int color = role.getColorRaw();
+                if (color == Role.DEFAULT_COLOR_RAW) {
+                    continue;
+                }
+                if (role.getIcon() != null) {
+                    continue;
+                }
+                if (!COLOR_ROLE_MAP.containsKey(color)) {
+                    // Create the coloured star and register it on discord.
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    ImageIO.write(StarUtil.create(new Color(color)), "png", baos);
+                    baos.flush();
+                    role = guild.createRole()
+                            .setName(ROLE_NAME)
+                            .setIcon(Icon.from(baos.toByteArray()))
+                            .setPermissions(0L)
+                            .complete();
+                    COLOR_ROLE_MAP.put(color, role.getIdLong());
+                }
+            }
+            save();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public static void cacheJson() throws IOException {
+        String content = new String(Files.readAllBytes(FILE.toPath()));
+        
+        if (content.isEmpty()) {
+            content = "{}";
+        }
+        
+        JsonObject obj = JsonParser.parseString(content).getAsJsonObject();
+        
+        for (String key : obj.keySet()) {
+            long roleId = obj.get(key).getAsLong();
+            COLOR_ROLE_MAP.put(Integer.parseInt(key), roleId);
+        }
+    }
+
+    public static void save() throws IOException {
+        JsonObject json = new JsonObject();
+
+        for (int color : COLOR_ROLE_MAP.keySet()) {
+            json.addProperty(String.valueOf(color), COLOR_ROLE_MAP.get(color));
+        }
+
+        FILE.delete();
+        FILE.createNewFile();
+        Files.write(FILE.toPath(), json.toString().getBytes(), StandardOpenOption.WRITE);
+    }
+
+    public static Set<Long> retrieveVIPs() {
+        Set<Long> vips = new HashSet<>();
+        new DatabaseQuery()
+                .query(new BasicQuery("SELECT linked_accounts.discord_id  FROM linked_accounts, hypercube.ranks " +
+                        "WHERE linked_accounts.player_uuid = ranks.uuid AND ranks.vip = 1"))
+                .compile()
+                .run(result -> {
+                    ResultSet set = result.getResult();
+                    while (set.next()) {
+                        vips.add(set.getLong("discord_id"));
+                    }
+                });
+        return vips;
+    }
+
+    public static Role getRole(int color) {
+        if (color == Role.DEFAULT_COLOR_RAW) {
+            return null;
+        }
+        Guild guild = HelpBotInstance.getJda().getGuildById(HelpBotInstance.DF_GUILD);
+        if (!COLOR_ROLE_MAP.containsKey(color)) {
+            return null;
+        }
+        return guild.getRoleById(COLOR_ROLE_MAP.get(color));
+    }
+    
+
+}
diff --git a/src/main/java/com/diamondfire/helpbot/util/DateUtil.java b/src/main/java/com/diamondfire/helpbot/util/DateUtil.java
index 58cadcee..1dabcae6 100644
--- a/src/main/java/com/diamondfire/helpbot/util/DateUtil.java
+++ b/src/main/java/com/diamondfire/helpbot/util/DateUtil.java
@@ -1,8 +1,7 @@
 package com.diamondfire.helpbot.util;
 
 import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.LocalDate;
+import java.time.*;
 import java.util.*;
 
 @SuppressWarnings("deprecation")
diff --git a/src/main/java/com/diamondfire/helpbot/util/EmbedUtil.java b/src/main/java/com/diamondfire/helpbot/util/EmbedUtil.java
index 8300ff5f..d40f46d5 100644
--- a/src/main/java/com/diamondfire/helpbot/util/EmbedUtil.java
+++ b/src/main/java/com/diamondfire/helpbot/util/EmbedUtil.java
@@ -94,4 +94,8 @@ public static String titleSafe(String string) {
         }
         return string;
     }
+    
+    public static void labsCoreBranding(EmbedBuilder builder) {
+        builder.setFooter("Powered by labsCore", "https://derpystuff.gitlab.io/webstorage/discord/labscore/assets/brand/labscore-flask_prod.png");
+    }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/util/FakeEmote.java b/src/main/java/com/diamondfire/helpbot/util/FakeEmote.java
deleted file mode 100644
index a983d021..00000000
--- a/src/main/java/com/diamondfire/helpbot/util/FakeEmote.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.diamondfire.helpbot.util;
-
-public class FakeEmote {
-    
-    private final String name;
-    private final long id;
-    
-    public FakeEmote(String name, long id) {
-        this.name = name;
-        this.id = id;
-    }
-    
-    public String getEmote() {
-        return "<:" + name + ':' + id + '>';
-    }
-}
diff --git a/src/main/java/com/diamondfire/helpbot/util/FormatUtil.java b/src/main/java/com/diamondfire/helpbot/util/FormatUtil.java
index f8fef42b..5a5f470d 100644
--- a/src/main/java/com/diamondfire/helpbot/util/FormatUtil.java
+++ b/src/main/java/com/diamondfire/helpbot/util/FormatUtil.java
@@ -37,25 +37,17 @@ private static void applyTimeUnit(List<String> symbols, long millis, TimeUnit un
     
     public static long getTimeUnit(long millis, TimeUnit unit) {
         TimeUnit milli = TimeUnit.MILLISECONDS;
-        
-        switch (unit) {
-            case DAYS:
-                return milli.toDays(millis);
-            case HOURS:
-                return milli.toHours(millis) - TimeUnit.DAYS.toHours(milli.toDays(millis));
-            case MINUTES:
-                return milli.toMinutes(millis) - TimeUnit.HOURS.toMinutes(milli.toHours(millis));
-            case SECONDS:
-                return milli.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(milli.toMinutes(millis));
-            case MILLISECONDS:
-                return milli.toMillis(millis) - TimeUnit.SECONDS.toMillis(milli.toSeconds(millis));
-            case MICROSECONDS:
-                return millis;
-            case NANOSECONDS:
-                return milli.toNanos(millis);
-            default:
-                throw new UnsupportedOperationException();
-        }
+    
+        return switch (unit) {
+            case DAYS -> milli.toDays(millis);
+            case HOURS -> milli.toHours(millis) - TimeUnit.DAYS.toHours(milli.toDays(millis));
+            case MINUTES -> milli.toMinutes(millis) - TimeUnit.HOURS.toMinutes(milli.toHours(millis));
+            case SECONDS -> milli.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(milli.toMinutes(millis));
+            case MILLISECONDS -> milli.toMillis(millis) - TimeUnit.SECONDS.toMillis(milli.toSeconds(millis));
+            case MICROSECONDS -> millis;
+            case NANOSECONDS -> milli.toNanos(millis);
+            default -> throw new UnsupportedOperationException();
+        };
     }
     
     public static String formatTime(long duration, TimeUnit unit) {
diff --git a/src/main/java/com/diamondfire/helpbot/util/IOUtil.java b/src/main/java/com/diamondfire/helpbot/util/IOUtil.java
index 295066a7..16ef1cae 100644
--- a/src/main/java/com/diamondfire/helpbot/util/IOUtil.java
+++ b/src/main/java/com/diamondfire/helpbot/util/IOUtil.java
@@ -76,7 +76,7 @@ public static File zipFile(Path path, String fileName) throws IOException {
     
     
     public static File getFileFromSite(String url, String name) {
-        try (InputStream in = new URL(url).openStream();) {
+        try (InputStream in = new URL(url).openStream()) {
             File tempFile = ExternalFileUtil.generateFile(name);
             
             Files.write(tempFile.toPath(), in.readAllBytes(), StandardOpenOption.WRITE);
diff --git a/src/main/java/com/diamondfire/helpbot/util/PlainComponentSerializer.java b/src/main/java/com/diamondfire/helpbot/util/PlainComponentSerializer.java
index 3bc2586a..b15db61e 100644
--- a/src/main/java/com/diamondfire/helpbot/util/PlainComponentSerializer.java
+++ b/src/main/java/com/diamondfire/helpbot/util/PlainComponentSerializer.java
@@ -2,7 +2,6 @@
 
 import net.kyori.adventure.text.*;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.function.Function;
 
@@ -18,23 +17,23 @@ public PlainComponentSerializer() {
         this(component -> "");
     }
     
-    public PlainComponentSerializer(final @NonNull Function<TranslatableComponent, String> translatable) {
+    public PlainComponentSerializer(final Function<TranslatableComponent, String> translatable) {
         this.translatable = translatable;
     }
     
     @Override
-    public @NonNull TextComponent deserialize(final @NonNull String input) {
+    public TextComponent deserialize(final  String input) {
         return Component.text(input);
     }
     
     @Override
-    public @NonNull String serialize(final @NonNull Component component) {
+    public String serialize(final Component component) {
         final StringBuilder sb = new StringBuilder();
         this.serialize(sb, component);
         return sb.toString();
     }
     
-    public void serialize(final @NonNull StringBuilder sb, final @NonNull Component component) {
+    public void serialize(final StringBuilder sb, final  Component component) {
         if (component instanceof TextComponent) {
             sb.append(((TextComponent) component).content());
         } else if (component instanceof TranslatableComponent) {
diff --git a/src/main/java/com/diamondfire/helpbot/util/SolvedPostManager.java b/src/main/java/com/diamondfire/helpbot/util/SolvedPostManager.java
new file mode 100644
index 00000000..65340105
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/util/SolvedPostManager.java
@@ -0,0 +1,86 @@
+package com.diamondfire.helpbot.util;
+
+import com.diamondfire.helpbot.bot.HelpBotInstance;
+import com.diamondfire.helpbot.bot.command.reply.PresetBuilder;
+import com.diamondfire.helpbot.bot.command.reply.feature.informative.*;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
+import net.dv8tion.jda.api.entities.channel.unions.ChannelUnion;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+public final class SolvedPostManager {
+    
+    private SolvedPostManager() {}
+    
+    public static Optional<ForumTag> getSolvedTag(ThreadChannel channel) {
+        return Optional.ofNullable(channel.getParentChannel()
+                .asForumChannel()
+                .getAvailableTagById(HelpBotInstance.getConfig().getHelpChannelSolvedTag()));
+    }
+    
+    public static boolean isSolved(ThreadChannel channel) {
+        return channel.getName().startsWith("[SOLVED] ");
+    }
+    
+    public static void addSolved(ThreadChannel channel) {
+        Optional<ForumTag> optionalTag = getSolvedTag(channel);
+        if (optionalTag.isEmpty()) return;
+        ForumTag solvedTag = optionalTag.get();
+        
+        List<ForumTag> tags = new ArrayList<>(channel.getAppliedTags());
+        if (!tags.contains(solvedTag)) {
+            tags.add(solvedTag);
+            channel.getManager().setAppliedTags(tags).queue();
+        }
+        
+        if (!isSolved(channel)) {
+            channel.getManager().setName("[SOLVED] " + channel.getName()).queue();
+        }
+        
+        sendEmbed(channel, "Post marked as solved");
+    }
+    
+    public static void removeSolved(ThreadChannel channel) {
+        Optional<ForumTag> optionalTag = getSolvedTag(channel);
+        if (optionalTag.isEmpty()) return;
+        ForumTag solvedTag = optionalTag.get();
+        
+        List<ForumTag> tags = new ArrayList<>(channel.getAppliedTags());
+        if (tags.remove(solvedTag)) {
+            channel.getManager().setAppliedTags(tags).queue();
+        }
+        
+        if (isSolved(channel)) {
+            String newName = channel.getName().replaceFirst("\\[SOLVED] ", "");
+            channel.getManager().setName(newName.isEmpty() ? "Post" : newName).queue();
+        }
+        
+        sendEmbed(channel, "Post marked as unsolved");
+    }
+    
+    private static void sendEmbed(ThreadChannel channel, String message) {
+        channel.sendMessageEmbeds(
+                new PresetBuilder()
+                        .withPreset(new InformativeReply(InformativeReplyType.SUCCESS, message))
+                        .getEmbed()
+                        .build()
+        ).queue();
+    }
+    
+    public static Optional<ThreadChannel> getHelpPost(ChannelUnion channel) {
+        if (channel.getType() != ChannelType.GUILD_PUBLIC_THREAD) {
+            return Optional.empty();
+        }
+        
+        ThreadChannel threadChannel = channel.asThreadChannel();
+        if (threadChannel.getParentChannel().getIdLong() != HelpBotInstance.getConfig().getHelpChannel()) {
+            return Optional.empty();
+        }
+        
+        return Optional.of(threadChannel);
+    }
+    
+}
\ No newline at end of file
diff --git a/src/main/java/com/diamondfire/helpbot/util/StarUtil.java b/src/main/java/com/diamondfire/helpbot/util/StarUtil.java
new file mode 100644
index 00000000..f268069f
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/util/StarUtil.java
@@ -0,0 +1,40 @@
+package com.diamondfire.helpbot.util;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+
+/**
+ * Creates a coloured star to be used as a role icon.
+ */
+public class StarUtil {
+    
+    private static final BufferedImage STAR;
+    private static final int SIZE = 64;
+    
+    static {
+        // Load the star from the resources.
+        InputStream inputStream = StarUtil.class.getResourceAsStream("/star.png");
+
+        try {
+            assert inputStream != null;
+            STAR = ImageIO.read(inputStream);
+        }catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    public static BufferedImage create(Color color) {
+        BufferedImage bufferedImage = new BufferedImage(SIZE, SIZE, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2d = bufferedImage.createGraphics();
+        
+        g2d.drawImage(STAR, 0, 0, null);
+        g2d.setComposite(AlphaComposite.SrcAtop);
+        g2d.setColor(color);
+        g2d.fillRect(0, 0, SIZE, SIZE);
+        g2d.dispose();
+        return bufferedImage;
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/util/StringUtil.java b/src/main/java/com/diamondfire/helpbot/util/StringUtil.java
index 13be818d..390299db 100644
--- a/src/main/java/com/diamondfire/helpbot/util/StringUtil.java
+++ b/src/main/java/com/diamondfire/helpbot/util/StringUtil.java
@@ -1,11 +1,16 @@
 package com.diamondfire.helpbot.util;
 
 import net.dv8tion.jda.api.utils.MarkdownSanitizer;
+import net.kyori.adventure.text.*;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 
 import java.util.*;
+import java.util.regex.*;
 
 public class StringUtil {
     
+    private static final Pattern UNICODE_PATTERN = Pattern.compile("§u([\\da-f]{5})");
+
     public static String listView(String pointer, boolean sanitize, Iterable<? extends CharSequence> array) {
         String view = listView(pointer, array);
         return sanitize ? StringUtil.display(view) : view;
@@ -84,6 +89,18 @@ public static String display(String string) {
         return MarkdownSanitizer.escape(StringUtil.stripColorCodes(string));
     }
     
+    public static String fromMiniMessage(String expression) {
+        Matcher matcher = UNICODE_PATTERN.matcher(expression);
+        StringBuilder builder = new StringBuilder();
+        while (matcher.find()) {
+            int value = Integer.parseInt(matcher.group(1), 16);
+            matcher.appendReplacement(builder, Matcher.quoteReplacement(String.valueOf(Character.toChars(value))));
+        }
+        matcher.appendTail(builder);
+        Component component = MiniMessage.miniMessage().deserialize(StringUtil.stripColorCodes(builder.toString()));
+        return MarkdownSanitizer.escape(PlainComponentSerializer.INSTANCE.serialize(component));
+    }
+    
     public static String sCheck(String text, int number) {
         return number == 1 ? text : text + "s";
     }
@@ -107,4 +124,12 @@ public static byte[] fromBase64(byte[] Base64F) {
     public static byte[] toBase64(byte[] Base64F) {
         return Base64.getEncoder().encode(Base64F);
     }
+    
+    public static String trim(String str, int max) {
+        if (str.length() > max) {
+            return str.substring(0, max - 3) + "..";
+        } else {
+            return str;
+        }
+    }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/util/TemporaryRunnableStorage.java b/src/main/java/com/diamondfire/helpbot/util/TemporaryRunnableStorage.java
new file mode 100644
index 00000000..e657c4f9
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/util/TemporaryRunnableStorage.java
@@ -0,0 +1,89 @@
+package com.diamondfire.helpbot.util;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+public class TemporaryRunnableStorage<K, V> {
+    
+    private static final ScheduledExecutorService STORAGE_WORKER = Executors.newScheduledThreadPool(1);
+    private static final int DELAY = 5;
+    private static final TimeUnit DELAY_UNIT = TimeUnit.MINUTES;
+    
+    private final Map<K, Container> storage = new HashMap<>();
+    
+    public void put(K key, V value, Runnable onPurge, boolean persistent) {
+        Container removed = this.storage.remove(key);
+        if (removed != null) {
+            removed.onPurge.run();
+        }
+        
+        this.storage.put(key, new Container(STORAGE_WORKER.schedule(() -> {
+            onPurge.run();
+            this.storage.remove(key);
+        }, DELAY, DELAY_UNIT), value, persistent, onPurge));
+    }
+    
+    public void put(K key, V value, Runnable onPurge) {
+        put(key, value, onPurge, false);
+    }
+    
+    public V get(K key) {
+        Container container = storage.get(key);
+        if (container == null) {
+            return null;
+        }
+        
+        return container.value;
+    }
+    
+    public void expireKey(K key) {
+        Container container = storage.remove(key);
+        
+        ScheduledFuture<?> future = container.getFuture();
+        future.cancel(true);
+        if (container.persistent()) {
+            put(key, container.getValue(), container.getOnPurge(), true);
+        }
+    }
+    
+    public boolean containsKey(K key) {
+        return storage.containsKey(key);
+    }
+    
+    public Set<K> getKeys() {
+        return storage.keySet();
+    }
+    
+    private class Container {
+        
+        private final ScheduledFuture<?> future;
+        private final V value;
+        
+        private final boolean persistent;
+        private final Runnable onPurge;
+        
+        public Container(ScheduledFuture<?> future, V value, boolean persistent, Runnable onPurge) {
+            this.future = future;
+            this.value = value;
+            this.persistent = persistent;
+            this.onPurge = onPurge;
+        }
+        
+        public ScheduledFuture<?> getFuture() {
+            return future;
+        }
+        
+        public V getValue() {
+            return value;
+        }
+        
+        public boolean persistent() {
+            return persistent;
+        }
+        
+        public Runnable getOnPurge() {
+            return onPurge;
+        }
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/util/Util.java b/src/main/java/com/diamondfire/helpbot/util/Util.java
index 65c5cf06..25df6f31 100644
--- a/src/main/java/com/diamondfire/helpbot/util/Util.java
+++ b/src/main/java/com/diamondfire/helpbot/util/Util.java
@@ -5,18 +5,33 @@
 import com.diamondfire.helpbot.sys.database.impl.DatabaseQuery;
 import com.diamondfire.helpbot.sys.database.impl.queries.BasicQuery;
 import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
-import com.google.gson.*;
-import net.dv8tion.jda.api.*;
-import net.dv8tion.jda.api.entities.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.sql.ResultSet;
 import java.util.*;
 
 public class Util {
     
+    public static final long VERIFIED = HelpBotInstance.getConfig().getVerifiedRole();
+    
     public static Deque<String> getUnicodeNumbers() {
         Deque<String> nums = new ArrayDeque<>();
         nums.add("\u0031\uFE0F\u20E3");
@@ -32,6 +47,14 @@ public static Deque<String> getUnicodeNumbers() {
         return nums;
     }
     
+    public static UUID toUuid(String str) {
+        if (str.contains("-")) {
+            return UUID.fromString(str);
+        } else {
+            return UUID.fromString(str.replaceFirst("(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)", "$1-$2-$3-$4-$5"));
+        }
+    }
+    
     public static File fetchMinecraftTextureFile(String fileName) {
         File imagesDir = ExternalFiles.IMAGES_DIR;
         try {
@@ -99,11 +122,9 @@ public static void log(PresetBuilder builder) {
     }
     
     public static void log(EmbedBuilder builder) {
-        HelpBotInstance.getJda().getTextChannelById(HelpBotInstance.LOG_CHANNEL).sendMessage(builder.build()).queue();
+        HelpBotInstance.getJda().getTextChannelById(HelpBotInstance.LOG_CHANNEL).sendMessageEmbeds(builder.build()).queue();
     }
     
-    public static final long VERIFIED = HelpBotInstance.getConfig().getVerifiedRole();
-    
     public static void updateGuild(HashMap<Long, String> accounts, Guild guild) {
         Role verifiedRoles = guild.getRoleById(VERIFIED);
         guild.loadMembers((member) -> {
@@ -190,4 +211,25 @@ public static void updateMember(Member member) {
                     updateMember(member, table.getString("name"), member.getGuild().getRoleById(VERIFIED));
                 });
     }
+    
+    public static List<ActionRow> of(List<Button> components) {
+        Deque<Button> buttons = new ArrayDeque<>(components);
+        List<Button> queue = new ArrayList<>();
+        
+        List<ActionRow> rows = new ArrayList<>();
+        
+        while (!buttons.isEmpty()) {
+            queue.add(buttons.pop());
+            if (queue.size() >= 5) {
+                rows.add(ActionRow.of(queue));
+                queue.clear();
+            }
+        }
+        
+        if (!queue.isEmpty()) {
+            rows.add(ActionRow.of(queue));
+        }
+        
+        return rows;
+    }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/util/WebUtil.java b/src/main/java/com/diamondfire/helpbot/util/WebUtil.java
new file mode 100644
index 00000000..b2c37be1
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/util/WebUtil.java
@@ -0,0 +1,35 @@
+package com.diamondfire.helpbot.util;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.Charset;
+
+public class WebUtil {
+    
+    public static String getString(String urlToRead, Charset charset) throws IOException {
+        URL url = new URL(urlToRead);
+        BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream(), charset));
+        StringBuilder builder = new StringBuilder();
+        String line;
+        
+        while ((line = in.readLine()) != null) {
+            builder.append("\n").append(line);
+        }
+        in.close();
+        return builder.toString();
+    }
+    
+    public static String getString(String urlToRead) throws IOException {
+        return getString(urlToRead, Charset.defaultCharset());
+    }
+    
+    public static JsonElement getJson(String url) throws IOException {
+        return JsonParser.parseString(getString(url));
+    }
+    
+}
diff --git a/src/main/java/com/diamondfire/helpbot/util/nbs/NBSDecoder.java b/src/main/java/com/diamondfire/helpbot/util/nbs/NBSDecoder.java
index a38628cf..7031b3ae 100644
--- a/src/main/java/com/diamondfire/helpbot/util/nbs/NBSDecoder.java
+++ b/src/main/java/com/diamondfire/helpbot/util/nbs/NBSDecoder.java
@@ -52,7 +52,7 @@ private static SongData parse(InputStream inputStream, File songFile) throws IOE
         speed = actualSpeed / 100f; //speed
         dataInputStream.readBoolean(); //autosave
         dataInputStream.readByte(); //autosave duration
-        timeSignature = (short) dataInputStream.readByte(); //time signature
+        timeSignature = dataInputStream.readByte(); //time signature
         readInt(dataInputStream); //minutes spent
         readInt(dataInputStream); //left clicks
         readInt(dataInputStream); //right clicks
@@ -222,7 +222,7 @@ private static SongData parse(InputStream inputStream, File songFile) throws IOE
                         }
                     }
                 }
-                stringBuilder.append(columnStringBuilder.toString());
+                stringBuilder.append(columnStringBuilder);
             }
         }
 
diff --git a/src/main/java/com/diamondfire/helpbot/util/nbs/NBSToTemplate.java b/src/main/java/com/diamondfire/helpbot/util/nbs/NBSToTemplate.java
index 6eee3ec0..2dcc8375 100644
--- a/src/main/java/com/diamondfire/helpbot/util/nbs/NBSToTemplate.java
+++ b/src/main/java/com/diamondfire/helpbot/util/nbs/NBSToTemplate.java
@@ -1,6 +1,8 @@
 package com.diamondfire.helpbot.util.nbs;
 
+import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 // from https://github.com/CodeUtilities/CodeUtilities
 
 
@@ -39,7 +41,7 @@ public NBSToTemplate(SongData song) {
         this.customInstrumentCount = song.getCustomInstrumentCount();
     }
 
-    public String convert() {
+    public byte[] convert() throws IOException {
         String[] songData = song.split("=");
         StringBuilder currentNotes = new StringBuilder();
         StringBuilder code = new StringBuilder();
@@ -91,7 +93,7 @@ public String convert() {
 
                 if (currentNotes.length() > 1930) {
                     currentNotes = new StringBuilder(revertString);
-                    currentBlock.append(String.format(",{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":%d}", currentNotes.toString(), slot));
+                    currentBlock.append(String.format(",{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":%d}", currentNotes, slot));
                     currentNotes.setLength(0);
                     noteCount = 0;
                     finalNote = true;
@@ -101,7 +103,7 @@ public String convert() {
 
                 if (i >= songData.length - 1) {
                     if (!finalNote) {
-                        currentBlock.append(String.format(",{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":%d}", currentNotes.toString(), slot));
+                        currentBlock.append(String.format(",{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":%d}", currentNotes, slot));
                         currentNotes.setLength(0);
                     }
                     closeChest = true;
@@ -117,7 +119,7 @@ public String convert() {
                 }
 
                 currentBlock.append(String.format("]},\"action\":\"%s\"},", varActionType));
-                code.append(currentBlock.toString());
+                code.append(currentBlock);
                 currentBlock.setLength(0);
                 currentNotes.setLength(0);
 
@@ -148,12 +150,13 @@ public String convert() {
                 currentSlot++;
             }
             instList.append("]},\"action\":\"CreateList\"},");
-            code.append(instList.toString());
+            code.append(instList);
         }
 
         //CreateList: songData
         code.append(String.format("{\"id\":\"block\",\"block\":\"set_var\",\"args\":{\"items\":[{\"item\":{\"id\":\"var\",\"data\":{\"name\":\"songData\",\"scope\":\"local\"}},\"slot\":0},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":1},{\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":2},{\"item\":{\"id\":\"num\",\"data\":{\"name\":\"%s\"}},\"slot\":3}, {\"item\":{\"id\":\"num\",\"data\":{\"name\":\"%d\"}},\"slot\":4}, {\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":5}, {\"item\":{\"id\":\"txt\",\"data\":{\"name\":\"%s\"}},\"slot\":6},{\"item\":{\"id\":\"num\",\"data\":{\"name\":\"%d\"}},\"slot\":7},{\"item\":{\"id\":\"num\",\"data\":{\"name\":\"%d\"}},\"slot\":8}]},\"action\":\"CreateList\"}", name, author, songTempo, length, layers, version, loopTick, loopCount));
 
-        return "{\"blocks\": [" + code + "]}";
+        String data = "{\"blocks\": [" + code + "]}";
+        return CompressionUtil.toBase64(CompressionUtil.toGZIP(data.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/src/main/java/com/diamondfire/helpbot/util/serializer/Serializer.java b/src/main/java/com/diamondfire/helpbot/util/serializer/Serializer.java
new file mode 100644
index 00000000..6f201bfc
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/util/serializer/Serializer.java
@@ -0,0 +1,16 @@
+package com.diamondfire.helpbot.util.serializer;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface for serializer classes.
+ *
+ * @param <S> Serialized value
+ * @param <D> Deserialized value
+ */
+public interface Serializer<S, D> {
+    
+    S serialize(@NotNull D toSerialize);
+    
+    D deserialize(@NotNull S toDeserialize);
+}
diff --git a/src/main/java/com/diamondfire/helpbot/util/serializer/TagSerializer.java b/src/main/java/com/diamondfire/helpbot/util/serializer/TagSerializer.java
new file mode 100644
index 00000000..b78312c1
--- /dev/null
+++ b/src/main/java/com/diamondfire/helpbot/util/serializer/TagSerializer.java
@@ -0,0 +1,38 @@
+package com.diamondfire.helpbot.util.serializer;
+
+import com.diamondfire.helpbot.sys.tag.Tag;
+import com.google.gson.JsonObject;
+import org.jetbrains.annotations.NotNull;
+
+public class TagSerializer implements Serializer<JsonObject, Tag> {
+    
+    private static final TagSerializer instance = new TagSerializer();
+    
+    public static TagSerializer getInstance() {
+        return instance;
+    }
+    
+    @Override
+    public JsonObject serialize(@NotNull Tag tag) {
+        JsonObject json = new JsonObject();
+    
+        json.addProperty("activator", tag.getActivator());
+        json.addProperty("title", tag.getTitle());
+        json.addProperty("response", tag.getResponse());
+        json.addProperty("authorId", tag.getAuthorId());
+        json.addProperty("image", tag.getImage());
+    
+        return json;
+    }
+    
+    @Override
+    public Tag deserialize(@NotNull JsonObject toDeserialize) {
+        return new Tag(
+                toDeserialize.get("activator").getAsString(),
+                toDeserialize.get("title").getAsString(),
+                toDeserialize.get("response").getAsString(),
+                toDeserialize.get("authorId").getAsLong(),
+                toDeserialize.get("image").getAsString()
+        );
+    }
+}
diff --git a/src/main/java/com/diamondfire/helpbot/util/textgen/CacheData.java b/src/main/java/com/diamondfire/helpbot/util/textgen/CacheData.java
index c016036e..bf1e96d9 100644
--- a/src/main/java/com/diamondfire/helpbot/util/textgen/CacheData.java
+++ b/src/main/java/com/diamondfire/helpbot/util/textgen/CacheData.java
@@ -1,16 +1,17 @@
 package com.diamondfire.helpbot.util.textgen;
 
+import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
+
 import java.io.*;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.*;
 
 import static com.diamondfire.helpbot.util.textgen.MarkovManipulation.addWord;
 
 public class CacheData {
     
-    public static void CacheData() throws IOException {
+    public static void cacheData() throws IOException {
         
-        File file = new File("samquotes.txt");
+        File file = ExternalFiles.SAM_QUOTES;
         BufferedReader br = new BufferedReader(new FileReader(file));
         
         FileWriter fileWriter = new FileWriter("markov.txt");
@@ -20,17 +21,12 @@ public static void CacheData() throws IOException {
         String line;
         while ((line = br.readLine()) != null) {
             
-            ArrayList<String> splitLine = new ArrayList<>();
-            splitLine.addAll(Arrays.asList(line.split(" ")));
-            
+            List<String> splitLine = Arrays.asList(line.split(" "));
             for (int i = 0; i < splitLine.size(); i++) {
                 
                 if (i == splitLine.size() - 1) {
-                    
                     addWord(splitLine.get(i), ".");
-                    
                 } else {
-                    
                     addWord(splitLine.get(i), splitLine.get(i + 1));
                 }
             }
diff --git a/src/main/resources/star.png b/src/main/resources/star.png
new file mode 100644
index 00000000..10d5e0f0
Binary files /dev/null and b/src/main/resources/star.png differ