diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..da0a208
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,313 @@
+---
+BasedOnStyle: Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: BlockIndent
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: true
+AlignConsecutiveBitFields:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveDeclarations:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveMacros:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveShortCaseStatements:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCaseArrows: false
+  AlignCaseColons: false
+AlignConsecutiveTableGenBreakingDAGArgColons:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveTableGenCondOperatorColons:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignConsecutiveTableGenDefinitionColons:
+  Enabled: false
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  AlignFunctionPointers: false
+  PadOperators: false
+AlignEscapedNewlines: Left
+AlignOperands: AlignAfterOperator
+AlignTrailingComments:
+  Kind: Never
+  OverEmptyLines: 0
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowBreakBeforeNoexceptSpecifier: Never
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseExpressionOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortLambdasOnASingleLine: None
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AttributeMacros:
+  - __capability
+BinPackArguments: false
+BinPackParameters: false
+BitFieldColonSpacing: Both
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Never
+BreakAfterJavaFieldAnnotations: false
+BreakAfterReturnType: None
+BreakArrays: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeConceptDeclarations: Always
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakFunctionDefinitionParameters: false
+BreakInheritanceList: AfterColon
+BreakStringLiterals: false
+BreakTemplateDeclarations: Yes
+ColumnLimit: 150
+CommentPragmas: "^ IWYU pragma:"
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat: false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: ^<ext/.*\.h>
+    Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: ^<.*\.h>
+    Priority: 1
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: ^<.*
+    Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: .*
+    Priority: 3
+    SortPriority: 0
+    CaseSensitive: false
+IncludeIsMainRegex: ([-_](test|unittest))?$
+IncludeIsMainSourceRegex: ""
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentRequiresClause: false
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+InsertBraces: true
+InsertNewlineAtEOF: true
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary: 0
+  BinaryMinDigits: 0
+  Decimal: 0
+  DecimalMinDigits: 0
+  Hex: 0
+  HexMinDigits: 0
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLines:
+  AtEndOfFile: false
+  AtStartOfBlock: false
+  AtStartOfFile: false
+LambdaBodyIndentation: Signature
+Language: Cpp
+LineEnding: LF
+MacroBlockBegin: ""
+MacroBlockEnd: ""
+MainIncludeChar: Quote
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+ObjCBinPackProtocolList: Never
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PPIndentWidth: -1
+PackConstructorInitializers: CurrentLine
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakScopeResolution: 500
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 100
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 0
+PointerAlignment: Left
+QualifierAlignment: Right
+RawStringFormats:
+  - Language: Cpp
+    Delimiters:
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - c++
+      - C++
+    CanonicalDelimiter: ""
+    BasedOnStyle: google
+  - Language: TextProto
+    Delimiters:
+      - pb
+      - PB
+      - proto
+      - PROTO
+    EnclosingFunctions:
+      - EqualsProto
+      - EquivToProto
+      - PARSE_PARTIAL_TEXT_PROTO
+      - PARSE_TEST_PROTO
+      - PARSE_TEXT_PROTO
+      - ParseTextOrDie
+      - ParseTextProtoOrDie
+      - ParseTestProto
+      - ParsePartialTestProto
+    CanonicalDelimiter: pb
+    BasedOnStyle: google
+ReferenceAlignment: Pointer
+ReflowComments: true
+RemoveBracesLLVM: false
+RemoveParentheses: Leave
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Always
+ShortNamespaceLines: 1
+SkipMacroDefinitionBody: false
+SortIncludes: CaseInsensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeJsonColon: false
+SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDeclarationName: false
+  AfterFunctionDefinitionName: false
+  AfterIfMacros: true
+  AfterOverloadedOperator: false
+  AfterPlacementOperator: true
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: true
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: Never
+SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+SpacesInParens: Never
+SpacesInParensOptions:
+  ExceptDoubleParentheses: false
+  InConditionalStatements: false
+  InCStyleCasts: false
+  InEmptyParentheses: false
+  Other: false
+SpacesInSquareBrackets: false
+Standard: Auto
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth: 8
+TableGenBreakInsideDAGArg: DontBreak
+UseTab: Never
+VerilogBreakBetweenInstancePorts: true
+WhitespaceSensitiveMacros:
+  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
+KeepEmptyLinesAtTheStartOfBlocks: false
+Macros:
+  - DECLARE_CLASS_CODEGEN=
+  - DECLARE_CLASS_CODEGEN_INTERFACES=
+  - DECLARE_JSON_CLASS=
+KeepEmptyLinesAtEOF: false
diff --git a/.clangd b/.clangd
new file mode 100644
index 0000000..ba4cbb3
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,2 @@
+Diagnostics:
+  UnusedIncludes: None
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index db1edb0..b3a490c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,6 +27,7 @@ jobs:
     - name: Get QPM
       uses: Fernthedev/qpm-action@v1
       with:
+        resolve_ndk: true
         #required
         workflow_token: ${{secrets.GITHUB_TOKEN}}
         restore: true # will run restore on download
@@ -35,12 +36,12 @@ jobs:
     - name: Build
       run: |
         cd ${GITHUB_WORKSPACE}
-        pwsh -Command ./build.ps1
+        pwsh -Command ./build.ps1 -release
         qpm qmod build
 
     - name: Create Qmod
       run: |
-        pwsh -Command ./createqmod.ps1 ${{env.qmodName}}
+        pwsh -Command ./createqmod.ps1 ${{env.qmodName}} -release
 
     - name: Get Library Name
       id: libname
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ec3d080..ba75547 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -39,6 +39,7 @@ jobs:
     - name: Get QPM
       uses: Fernthedev/qpm-action@v1
       with:
+        resolve_ndk: true
         #required
         workflow_token: ${{secrets.GITHUB_TOKEN}}
         restore: true # will run restore on download
@@ -51,12 +52,12 @@ jobs:
     - name: Build
       run: |
         cd ${GITHUB_WORKSPACE}
-        pwsh -Command ./build.ps1
+        pwsh -Command ./build.ps1 -release
         qpm qmod build
 
     - name: Create Qmod
       run: |
-        pwsh -Command ./createqmod.ps1 ${{env.qmodName}}
+        pwsh -Command ./createqmod.ps1 ${{env.qmodName}} -release
 
     - name: Get Library Name and Build ID
       id: libname
diff --git a/.gitignore b/.gitignore
index 734f51b..b3057c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,4 +53,5 @@ tombstone_00
 mod.json
 extern.cmake
 qpm_defines.cmake
-node_modules
\ No newline at end of file
+node_modules
+.cache/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..4722adf
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "llvm-vs-code-extensions.vscode-clangd",
+    "ms-vscode.cmake-tools"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c70baeb..0613290 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,127 +1,161 @@
 {
-    "files.associations": {
-        "*.ejs": "html",
-        "*.php": "php",
-        "iosfwd": "cpp",
-        "__config": "cpp",
-        "__nullptr": "cpp",
-        "thread": "cpp",
-        "any": "cpp",
-        "deque": "cpp",
-        "list": "cpp",
-        "map": "cpp",
-        "optional": "cpp",
-        "queue": "cpp",
-        "set": "cpp",
-        "stack": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "variant": "cpp",
-        "vector": "cpp",
-        "*.bsml": "xml",
-        "__bit_reference": "cpp",
-        "__debug": "cpp",
-        "__errc": "cpp",
-        "__functional_base": "cpp",
-        "__hash_table": "cpp",
-        "__locale": "cpp",
-        "__mutex_base": "cpp",
-        "__node_handle": "cpp",
-        "__split_buffer": "cpp",
-        "__string": "cpp",
-        "__threading_support": "cpp",
-        "__tree": "cpp",
-        "__tuple": "cpp",
-        "algorithm": "cpp",
-        "array": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "bitset": "cpp",
-        "cctype": "cpp",
-        "cfenv": "cpp",
-        "charconv": "cpp",
-        "chrono": "cpp",
-        "cinttypes": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "codecvt": "cpp",
-        "compare": "cpp",
-        "complex": "cpp",
-        "condition_variable": "cpp",
-        "csetjmp": "cpp",
-        "csignal": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "exception": "cpp",
-        "coroutine": "cpp",
-        "propagate_const": "cpp",
-        "forward_list": "cpp",
-        "fstream": "cpp",
-        "functional": "cpp",
-        "future": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "ios": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "iterator": "cpp",
-        "limits": "cpp",
-        "locale": "cpp",
-        "memory": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numeric": "cpp",
-        "ostream": "cpp",
-        "random": "cpp",
-        "ratio": "cpp",
-        "regex": "cpp",
-        "scoped_allocator": "cpp",
-        "span": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "string": "cpp",
-        "string_view": "cpp",
-        "strstream": "cpp",
-        "system_error": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "typeindex": "cpp",
-        "typeinfo": "cpp",
-        "utility": "cpp",
-        "valarray": "cpp",
-        "xstring": "cpp",
-        "xlocale": "cpp",
-        "xlocbuf": "cpp",
-        "concepts": "cpp",
-        "filesystem": "cpp",
-        "shared_mutex": "cpp",
-        "xfacet": "cpp",
-        "xhash": "cpp",
-        "xiosbase": "cpp",
-        "xlocinfo": "cpp",
-        "xlocmes": "cpp",
-        "xlocmon": "cpp",
-        "xlocnum": "cpp",
-        "xloctime": "cpp",
-        "xmemory": "cpp",
-        "xstddef": "cpp",
-        "xtr1common": "cpp",
-        "xtree": "cpp",
-        "xutility": "cpp",
-        "format": "cpp",
-        "stop_token": "cpp",
-        "resumable": "cpp",
-        "source_location": "cpp",
-        "__std_stream": "cpp",
-        "ranges": "cpp",
-        "__verbose_abort": "cpp"
+  "[c]": {
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+  },
+  "[cpp]": {
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+  },
+  "[h]": {
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+  },
+  "[hpp]": {
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+  },
+  "cmake.automaticReconfigure": false,
+  "cmake.configureOnEdit": false,
+  "cmake.configureOnOpen": false,
+  "cmake.useCMakePresets": "never",
+  "editor.formatOnSave": true,
+  "editor.renderFinalNewline": "on",
+  "editor.trimAutoWhitespace": true,
+  "files.associations": {
+    "*.ejs": "html",
+    "*.php": "php",
+    "*.bsml": "xml",
+    "iosfwd": "cpp",
+    "__config": "cpp",
+    "__nullptr": "cpp",
+    "thread": "cpp",
+    "any": "cpp",
+    "deque": "cpp",
+    "list": "cpp",
+    "map": "cpp",
+    "optional": "cpp",
+    "queue": "cpp",
+    "set": "cpp",
+    "stack": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "variant": "cpp",
+    "vector": "cpp",
+    "__bit_reference": "cpp",
+    "__debug": "cpp",
+    "__errc": "cpp",
+    "__functional_base": "cpp",
+    "__hash_table": "cpp",
+    "__locale": "cpp",
+    "__mutex_base": "cpp",
+    "__node_handle": "cpp",
+    "__split_buffer": "cpp",
+    "__string": "cpp",
+    "__threading_support": "cpp",
+    "__tree": "cpp",
+    "__tuple": "cpp",
+    "algorithm": "cpp",
+    "array": "cpp",
+    "atomic": "cpp",
+    "bit": "cpp",
+    "bitset": "cpp",
+    "cctype": "cpp",
+    "cfenv": "cpp",
+    "charconv": "cpp",
+    "chrono": "cpp",
+    "cinttypes": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "codecvt": "cpp",
+    "compare": "cpp",
+    "complex": "cpp",
+    "condition_variable": "cpp",
+    "csetjmp": "cpp",
+    "csignal": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "exception": "cpp",
+    "coroutine": "cpp",
+    "propagate_const": "cpp",
+    "forward_list": "cpp",
+    "fstream": "cpp",
+    "functional": "cpp",
+    "future": "cpp",
+    "initializer_list": "cpp",
+    "iomanip": "cpp",
+    "ios": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "iterator": "cpp",
+    "limits": "cpp",
+    "locale": "cpp",
+    "memory": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numeric": "cpp",
+    "ostream": "cpp",
+    "random": "cpp",
+    "ratio": "cpp",
+    "regex": "cpp",
+    "scoped_allocator": "cpp",
+    "span": "cpp",
+    "sstream": "cpp",
+    "stdexcept": "cpp",
+    "streambuf": "cpp",
+    "string": "cpp",
+    "string_view": "cpp",
+    "strstream": "cpp",
+    "system_error": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "typeindex": "cpp",
+    "typeinfo": "cpp",
+    "utility": "cpp",
+    "valarray": "cpp",
+    "xstring": "cpp",
+    "xlocale": "cpp",
+    "xlocbuf": "cpp",
+    "concepts": "cpp",
+    "filesystem": "cpp",
+    "shared_mutex": "cpp",
+    "xfacet": "cpp",
+    "xhash": "cpp",
+    "xiosbase": "cpp",
+    "xlocinfo": "cpp",
+    "xlocmes": "cpp",
+    "xlocmon": "cpp",
+    "xlocnum": "cpp",
+    "xloctime": "cpp",
+    "xmemory": "cpp",
+    "xstddef": "cpp",
+    "xtr1common": "cpp",
+    "xtree": "cpp",
+    "xutility": "cpp",
+    "format": "cpp",
+    "stop_token": "cpp",
+    "resumable": "cpp",
+    "source_location": "cpp",
+    "__std_stream": "cpp",
+    "ranges": "cpp",
+    "__verbose_abort": "cpp",
+    "execution": "cpp",
+    "print": "cpp"
+  },
+  "files.insertFinalNewline": true,
+  "files.trimFinalNewlines": true,
+  "files.trimTrailingWhitespace": true,
+  "json.schemas": [
+    {
+      "fileMatch": ["/qpm.json"],
+      "url": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json"
+    },
+    {
+      "fileMatch": ["/qpm.shared.json"],
+      "url": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.shared.schema.json"
     }
-}
\ No newline at end of file
+  ]
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4594cc6..4d85a9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,14 +5,6 @@ cmake_minimum_required(VERSION 3.21)
 project(${COMPILE_ID})
 include(${EXTERN_DIR}/includes/kaleb/shared/cmake/assets.cmake)
 
-# Enable link time optimization
-# In my experience, this can be highly unstable but it nets a huge size optimization and likely performance
-# However, the instability was seen using Android.mk/ndk-build builds. With Ninja + CMake, this problem seems to have been solved.
-# As always, test thoroughly
-# - Fern
-# Reduces linking speed, disable in development for faster builds
-set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-
 # Hot reload (DO NOT USE IN PRODUCTION)
 # add_compile_options(-DHotReload)
 
@@ -30,9 +22,18 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 add_link_options(-Wl,--exclude-libs,ALL)
 add_compile_options(-frtti -fPIE -fPIC -fexceptions -fvisibility=hidden)
 
-add_compile_options(-O3)
-# Uncomment for faster builds (DO NOT USE IN PRODUCTION, it slows down the search 6 times)
-# add_compile_options(-O0)
+if(${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo" OR ${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+    
+    # Better optimizations
+    add_compile_options(-O3)
+
+    # LTO
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    add_compile_options(-flto)
+else()
+    # Debug options
+    add_compile_options(-O0 -g)
+endif()
 
 # get git info
 execute_process(COMMAND git config user.name OUTPUT_VARIABLE GIT_USER)
diff --git a/assets/FilterView.bsml b/assets/FilterView.bsml
index 1946565..71aaa84 100644
--- a/assets/FilterView.bsml
+++ b/assets/FilterView.bsml
@@ -6,7 +6,7 @@
 		</horizontal>
 		<horizontal horizontal-fit='PreferredSize' spacing='2' pad-right='1'>
 			<button text='Clear' on-click='ClearFilters' pref-width="15" />
-			<!-- <button text='Presets' on-click='ShowPresets' pref-width="15" /> -->
+			<button text='Presets' on-click='ShowPresets' pref-width="15" />
 		</horizontal>
 	</horizontal>
 	<!-- <macro.as-host host='currentFilter'> -->
@@ -34,13 +34,25 @@
 				</vertical>
 			</vertical>
 			<vertical spacing='2'>
-				<vertical child-control-height='false' bg='panel-top' pad='2' pad-bottom='1' pad-top='1' preferred-width='64'>
+				<vertical child-control-height='false' bg='panel-top' pad-top='1' preferred-width='64' pad-bottom='29' vertical-fit='PreferredSize'>
 					<text text='&lt;color=#DDD>BeatSaver' align='Center' underlined='true' bold='true' font-size='3.5' color='#69B' size-delta-y='5'/>
-						 <!-- formatter='DateTimeToStr'   formatter='FormatUploaderShortInfo' -->
-					<slider-setting text='Min upload date' id='hideOlderThanSlider' value="hideOlderThan"  bind-value="true" apply-on-change="true" min="0" max='2' increment='1' formatter='DateTimeToStr' on-change="UpdateFilterSettings"/>
-					<slider-setting id="minimumRatingSlider" text='Minimum Rating' value="minimumRating" bind-value="true" apply-on-change="true" max='0.9' increment='0.05' formatter='PercentFloat' on-change="UpdateFilterSettings"/>
-					<slider-setting text='Minimum Votes' id='minimumVotesSlider' value="minimumVotes" bind-value="true" apply-on-change="true" increment='1' max='100' on-change="UpdateFilterSettings"/>
-					<string-setting text='Uploader(s)' id='uploadersStringControl' value='uploadersString' bind-value='true' apply-on-change='true' on-change="UpdateFilterSettings" hover-hint='You can enter multiple Uploader names, seperated by spaces. If you have an Exclamation mark at the beginning of your input it becomes a blacklist for the given uploaders'/>
+					<scroll-view ignore-layout='true' size-delta-x='2' size-delta-y='-2' anchor-min-y='-0.2' anchor-max-y='0.8' anchor-max-x="1.09">
+						<vertical child-control-height='false' preferred-width='60' vertical-fit='PreferredSize' pad-left='1' pad-right='-2'>
+							<slider-setting text='Min upload date' id='hideOlderThanSlider' value="hideOlderThan"  bind-value="true" apply-on-change="true" min="0" max='2' increment='1' formatter='DateTimeToStr' on-change="UpdateFilterSettings"/>
+							<slider-setting id="minimumRatingSlider" text='Min Rating' value="minimumRating" bind-value="true" apply-on-change="true" max='0.9' increment='0.05' formatter='PercentFloat' on-change="UpdateFilterSettings"/>
+							<slider-setting text='Min Votes' id='minimumVotesSlider' value="minimumVotes" bind-value="true" apply-on-change="true" increment='1' max='100' on-change="UpdateFilterSettings"/>
+							<string-setting text='Uploader(s)' id='uploadersStringControl' value='uploadersString' bind-value='true' apply-on-change='true' on-change="UpdateFilterSettings" hover-hint='You can enter multiple Uploader names, seperated by spaces. If you have an Exclamation mark at the beginning of your input it becomes a blacklist for the given uploaders'/>
+							<dropdown-list-setting text='Map Style' id='mapStyleDropdown' value="mapStyleString" apply-on-change="true" bind-value="true" choices='mapStyles' formatter='FormatBeatSaverTag' on-change="UpdateFilterSettings"/>
+							<horizontal pad-right="-3">
+								<text text="Song Genre" align="MidlineLeft" italics="true"/>
+								<button id='genrePickButton' text="Any" preferred-width="29" on-click="ShowGenrePicker" all-uppercase="false"/>
+							</horizontal>
+							<checkbox-setting value="onlyCuratedMaps" text="Curated Maps" bind-value='true' apply-on-change='true' on-change="UpdateFilterSettings" />
+							<checkbox-setting value="onlyVerifiedMappers" text="Verified Mappers" bind-value='true' apply-on-change='true' on-change="UpdateFilterSettings"/>
+							<checkbox-setting value="onlyV3Maps" text="Only V3 Maps" bind-value='true' apply-on-change='true' on-change="UpdateFilterSettings"/>
+						</vertical>
+					</scroll-view>
+					
 				</vertical>
 				<vertical child-control-height='false' bg='panel-top' pad='2' pad-bottom='1' pad-top='1' preferred-width='64'>
 					<text text='&lt;color=#DDD>Characteristic / Difficulty' align='Center' underlined='true' bold='true' font-size='3.5' color='#69B' size-delta-y='5'/>
@@ -56,29 +68,27 @@
 	<!-- </macro.as-host> -->
 
 	<horizontal>
-		<!-- <horizontal preferred-width="65" child-expand-width="false" spacing='2' child-align='MiddleCenter'>
-			<text text="~version" font-size="3" font-color="#CC6E3B" align="Center"/>
-			<clickable-text text='♥ Donate' font-size="4" align="Center"  on-click="OpenSponsorsModal"/>
-		</horizontal> -->
+		<horizontal preferred-width="65" child-expand-width="false" spacing='2' child-align='MiddleCenter'>
+			<text id="versionLabel" text="~version" font-size="3" font-color="#CC6E3B" align="Center"/>
+			<!-- <clickable-text text='♥ Donate' font-size="4" align="Center"  on-click="OpenSponsorsModal"/> -->
+		</horizontal>
 		<horizontal preferred-width="65">
 			<clickable-text id="datasetInfoLabel" font-size="3" font-color="#CCC" text="Loading dataset..." align="Center"  on-click="TryToDownloadDataset"/>
 		</horizontal>
 	</horizontal>
 
-	<modal size-delta-x='80' size-delta-y='88'>
-		<vertical horizontal-fit='Unconstrained' pad='2' pad-top='9'>
-			<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
-				<text text='BetterSongSearch - Sponsors' align='Center'/>
-			</horizontal>
-			<text text='Are you enjoying my stuff and want to support me?' align='Center'/>
-			<horizontal>
-				<primary-button text='Open Website on Desktop' on-click='OpenSponsorsLink'/>
-				<button text='Close' on-click='CloseSponsorModal'/>
-			</horizontal>
-			<text text='Current sponsors' align='Center' underlined='true'/>
-			<vertical horizontal-fit='Unconstrained' vertical-fit='Unconstrained' preferred-height='50'>
-				<text-page id='sponsorsText' text='Loading...'/>
+	<bg>
+		<modal size-delta-x='80' size-delta-y='88' move-to-center="true" id="sponsorModal">
+			<vertical horizontal-fit='Unconstrained' pad='2' pad-top='9'>
+				<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
+					<text text='BetterSongSearch - Sponsors' align='Center'/>
+				</horizontal>
+				<text text='Are you enjoying my stuff and want to support me?' align='Center'/>
+				<horizontal>
+					<primary-button text='Open Website' on-click='OpenSponsorsLink'/>
+					<button text='Close' on-click='CloseSponsorModal'/>
+				</horizontal>
 			</vertical>
-		</vertical>
-	</modal>
+		</modal>
+	</bg>
 </vertical>
\ No newline at end of file
diff --git a/assets/GenrePicker.bsml b/assets/GenrePicker.bsml
new file mode 100644
index 0000000..7639e69
--- /dev/null
+++ b/assets/GenrePicker.bsml
@@ -0,0 +1,20 @@
+<bg xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
+	<modal id="genrePickerModal" clickerino-offerino-closerino='true' size-delta-x='80' size-delta-y='78'>
+		<vertical horizontal-fit='Unconstrained' pad='4' pad-bottom='2' pad-top='9'>
+			<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
+				<text text='BetterSongSearch - Genre Filter' align='Center' font-size='4'/>
+			</horizontal>
+			<horizontal horizontal-fit='PreferredSize'>
+				<vertical horizontal-fit='Unconstrained'>
+					<list id="genresTableData" visible-cells='12' cell-size='5' select-cell='GenreSelected' show-scrollbar='true' stick-scrolling="true"/>
+				</vertical>
+				<vertical id='scrollbarContainer' preferred-width='8'/>
+			</horizontal>
+			<horizontal>
+				<primary-button text='Select' on-click='SelectGenre'  pref-width="15"/>
+				<button text='Clear Selection' on-click='ClearGenre'  pref-width="25" />
+				<button text='Close' on-click='CloseModal'  pref-width="15"/>
+			</horizontal>
+		</vertical>
+	</modal>
+</bg>
\ No newline at end of file
diff --git a/assets/GenrePickerCell.bsml b/assets/GenrePickerCell.bsml
new file mode 100644
index 0000000..60bbe07
--- /dev/null
+++ b/assets/GenrePickerCell.bsml
@@ -0,0 +1,6 @@
+<horizontal child-expand-width='false' child-align='MiddleLeft' spacing='2'>
+	<clickable-text id='includeButton' font-size='3.5' on-click='IncludeGenre'/>
+	<horizontal child-expand-width='false'>
+		<clickable-text id='excludeButton' text='❌' font-size='3.5' align="Center" on-click='ExcludeGenre' hover-hint='Explicitly exclude any Map tagged with this Genre'/>
+	</horizontal>
+</horizontal>
\ No newline at end of file
diff --git a/assets/Presets.bsml b/assets/Presets.bsml
index 344b739..7f2fb12 100644
--- a/assets/Presets.bsml
+++ b/assets/Presets.bsml
@@ -1,40 +1,39 @@
-<bg xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
-	<modal clickerino-offerino-closerino='true' hide-event='ClosePresets' show-event='OpenPresets' size-delta-x='80' size-delta-y='78'>
+<bg xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
+	<modal id="presetsModal" clickerino-offerino-closerino='true' size-delta-x='80'
+		size-delta-y='78'>
 		<vertical horizontal-fit='Unconstrained' pad='4' pad-bottom='2' pad-top='9'>
-			<horizontal bg='panel-top-gradient'  ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
-				<text text='BetterSongSearch - Filter Presets' align='Center' font-size='4'/>
+			<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97'
+				anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
+				<text text='BetterSongSearch - Filter Presets' align='Center' font-size='4' />
 			</horizontal>
 			<horizontal horizontal-fit='PreferredSize'>
 				<vertical horizontal-fit='Unconstrained'>
-					<custom-list visible-cells='8' cell-size='7' id='presetList' select-cell='PresetSelected'>
-						<horizontal>
-							<text text='~name' id='label'/>
-						</horizontal>
-					</custom-list>
+					<list visible-cells='8' cell-size='8' id='presetListTableData'
+						select-cell='PresetSelected' show-scrollbar='true' stick-scrolling="true" />
 				</vertical>
-				<vertical id='presetScrollbarContainer' preferred-width='8'/>
 			</horizontal>
 			<horizontal>
-				<button text='Save..' click-event='ClosePresets,OpenAddPresetModal'/>
-				<button text='Load' id='loadButton' event-click='ClosePresets' on-click='LoadPreset'/>
-				<button text='Delete' id='deleteButton' on-click='DeletePreset'/>
-				<button text='Close' click-event='ClosePresets'/>
+				<button text='Save..' on-click='OpenSavePresetModal' pref-width="15" />
+				<button text='Load' id='loadButton' on-click='LoadPreset' pref-width="15" />
+				<button text='Delete' id='deleteButton' on-click='DeletePreset' pref-width="15" />
+				<button text='Close' on-click='CloseModal' pref-width="15" />
 			</horizontal>
 		</vertical>
 	</modal>
 
-	<modal hide-event='CloseAddPresetModal' show-event='OpenAddPresetModal' size-delta-x='70' size-delta-y='45'>
+	<modal id="savePresetModal" size-delta-x='70' size-delta-y='45'>
 		<vertical horizontal-fit='Unconstrained' pad='4' pad-top='-1'>
 			<horizontal pad-right='-2' pad-left='-2'>
 				<horizontal bg='panel-top-gradient'>
-					<text text='BetterSongSearch - Save Preset' align='Center' font-size='4'/>
+					<text text='BetterSongSearch - Save Preset' align='Center' font-size='4' />
 				</horizontal>
 			</horizontal>
-			<string-setting id='newPresetName' text='Name'/>
+			<string-setting id="newPresetNameSetting" text='Name' />
 			<horizontal>
-				<button text='Save' click-event='CloseAddPresetModal,OpenPresets' on-click='AddPreset'/>
-				<button text='Cancel' click-event='OpenPresets,CloseAddPresetModal'/>
+				<button text='Save' on-click='AddPreset' pref-width="15" />
+				<button text='Cancel' on-click='CloseSavePresetModal' pref-width="15" />
 			</horizontal>
 		</vertical>
 	</modal>
-</bg>
\ No newline at end of file
+</bg>
diff --git a/assets/PresetsListCell.bsml b/assets/PresetsListCell.bsml
new file mode 100644
index 0000000..f8fba21
--- /dev/null
+++ b/assets/PresetsListCell.bsml
@@ -0,0 +1,3 @@
+<horizontal id='bgContainer' bg='round-rect-panel' pad='1' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
+	<text id='presetNameLabel' align='MidlineLeft' overflow-mode='Ellipsis' word-wrapping='false' rich-text='false'/>
+</horizontal>
\ No newline at end of file
diff --git a/assets/Settings.bsml b/assets/Settings.bsml
index f45fe7d..cd3c7b3 100644
--- a/assets/Settings.bsml
+++ b/assets/Settings.bsml
@@ -1,4 +1,4 @@
-<!-- <bg xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'> -->
+<bg xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
 	<modal id="settingsModal" clickerino-offerino-closerino='true' size-delta-x='80' size-delta-y='45' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
 		<vertical horizontal-fit='Unconstrained' pad='4' pad-top='9'>
 			<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
@@ -8,26 +8,9 @@
 			<toggle-setting text='Download Song previews' value="loadSongPreviews" bind-value="true" apply-on-change="true" hover-hint="Load and play a short preview of songs not downloaded yet"/>
 			<toggle-setting text='Smaller Font size' value="smallerFontSize" bind-value="true" apply-on-change="true" hover-hint="Makes the Font size of the Song List smaller"/>
 			<list-setting text='Preferred leaderboard' value="preferredLeaderboard" choices='preferredLeaderboardOptions' bind-value="true" apply-on-change="true" hover-hint="Sets your preferred leaderboard when you don't filer by any leaderboard" />
-			<!-- <toggle-setting id="chinaToggle" text='Use Chinese BeatSaver Mirror' on-change="ChinaToggled"/> -->
 			<horizontal pad-top="2">
 				<button text='Close' on-click='CloseModal'/>
 			</horizontal>
 		</vertical>
 	</modal>
-
-	<!-- <modal id="chinaModal" clickerino-offerino-closerino='true' size-delta-x='80' size-delta-y='40'>
-		<vertical horizontal-fit='Unconstrained' pad='4' pad-top='9'>
-			<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
-				<text text='BetterSongSearch - China Mirror' align='Center'/>
-			</horizontal>
-			<horizontal pad-bottom='2'>
-				<text id='resultText' text='The chinese BeatSaver mirror is provided by WGzeyu and should only be used if you live in a part of China where BeatSaver happens to be not accessible' word-wrapping='true' align='Center'/>
-			</horizontal>
-			<horizontal>
-				<primary-button text='OK, Enable' on-click='EnableChinaMirror'/>
-				<button text='Cancel' on-click="" click-event='CloseChinaModal,ShowModal'/>
-				<button text='Open Website' on-click='ShowWGzeyuSite'/>
-			</horizontal>
-		</vertical>
-	</modal> -->
-<!-- </bg> -->
\ No newline at end of file
+</bg>
\ No newline at end of file
diff --git a/assets/UploadDetails.bsml b/assets/UploadDetails.bsml
index 65071f9..3c547d1 100644
--- a/assets/UploadDetails.bsml
+++ b/assets/UploadDetails.bsml
@@ -1,4 +1,4 @@
-<modal id="rootModal" clickerino-offerino-closerino='true' size-delta-x='90' size-delta-y='75' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'  xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
+<modal id="rootModal" clickerino-offerino-closerino='true' move-to-center="true"	 size-delta-x='120' size-delta-y='80' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'  xsi:noNamespaceSchemaLocation='https://raw.githubusercontent.com/RedBrumbler/Quest-BSML-Docs/gh-pages/schema.xsd'>
 	<vertical horizontal-fit='Unconstrained' pad='4' pad-top='9'>
 		<horizontal bg='panel-top-gradient' ignore-layout='true' anchor-max-x='.97' anchor-min-x='.03' anchor-min-y='1' anchor-pos-y='-5'>
 			<text text='BetterSongSearch - Upload Details' align='Center'/>
@@ -6,20 +6,24 @@
 		<horizontal vertical-fit='Unconstrained' horizontal-fit='Unconstrained'>
 			<vertical child-expand-height='false' preferred-width="25">
 				<text text="Song Key" align="Center" font-color='#7CF'/>
-                <text id="selectedSongKey" align="Center" all-uppercase='true'/>
+                <clickable-text id="selectedSongKey" align="Center" all-uppercase='true' on-click="CopyBSR" hover-hint="Click to copy the song key"/>
                 <text text="BeatSaver Rating" align="Center" font-color='#7CF'/>
                 <text id="selectedRating" align="Center"/>
                 <text text="Characteristics" align="Center" font-color='#7CF'/>
                 <text id="selectedCharacteristics" align="Center" font-size='3.3' word-wrapping='true'/>
 			</vertical>
-			<vertical child-expand-height="false" pad-left="6">
+			<vertical child-expand-height="false" pad-left="6"  horizontal-fit='PreferredSize' preferred-width="80">
 				<text text="Description" align="Center" font-color='#7CF'/>
 				<loading id="songDetailsLoading" preserve-aspect="true" preferred-height="20"/>
-				<vertical horizontal-fit='PreferredSize' preferred-width="60">
+				<vertical horizontal-fit='PreferredSize' preferred-width="80" preferred-height="70">
 					<text-page id="selectedSongDescription" align="Center" word-wrapping="true"/>
 				</vertical>
 			</vertical>
 		</horizontal>
-		<button on-click='CloseModal' text='Close Details'/>
+		<horizontal>
+			<button on-click='OpenBeatSaver' text='Open BeatSaver'/>
+			<button on-click='OpenMapPreview' text='Web Preview' hover-hint="This downloads the entire map in the browser btw"/>
+			<button on-click='CloseModal' text='Close Details'/>
+		</horizontal>
 	</vertical>
 </modal>
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index f135cbf..13a7a26 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,6 +1,8 @@
 Param(
     [Parameter(Mandatory=$false)]
-    [Switch]$clean
+    [Switch]$clean,
+    [Parameter(Mandatory=$false)]
+    [Switch]$release
 )
 
 # if user specified clean, remove all build files
@@ -12,6 +14,14 @@ if ($clean.IsPresent)
     }
 }
 
+$buildType = "Debug"
+if ($release.IsPresent) {
+    $buildType = "RelWithDebInfo"
+    echo "Building release"
+} else {
+    echo "Building debug"
+}
+
 $NDKPath = Get-Content $PSScriptRoot/ndkpath.txt
 
 if (($clean.IsPresent) -or (-not (Test-Path -Path "build")))
@@ -19,5 +29,7 @@ if (($clean.IsPresent) -or (-not (Test-Path -Path "build")))
     $out = new-item -Path build -ItemType Directory
 }
 
-& cmake -G "Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" . -B build 
-& cmake --build ./build
\ No newline at end of file
+& cmake -G "Ninja" -DCMAKE_BUILD_TYPE="$buildType" . -B build 
+& cmake --build ./build
+$ExitCode = $LastExitCode
+exit $ExitCode
\ No newline at end of file
diff --git a/copy.ps1 b/copy.ps1
index a146b81..942cf61 100644
--- a/copy.ps1
+++ b/copy.ps1
@@ -5,6 +5,9 @@ Param(
     [Parameter(Mandatory=$false)]
     [Switch] $log,
 
+    [Parameter(Mandatory=$false)]
+    [Switch]$release,
+
     [Parameter(Mandatory=$false)]
     [Switch] $useDebug,
 
@@ -39,7 +42,7 @@ if ($help -eq $true) {
     exit
 }
 
-& $PSScriptRoot/build.ps1 -clean:$clean
+& $PSScriptRoot/build.ps1 -clean:$clean -release:$release
 
 if ($LASTEXITCODE -ne 0) {
     echo "Failed to build, exiting..."
diff --git a/createqmod.ps1 b/createqmod.ps1
index 5b57653..33e4fdd 100644
--- a/createqmod.ps1
+++ b/createqmod.ps1
@@ -3,6 +3,9 @@ Param(
 
     [Parameter(Mandatory=$false)]
     [Switch] $clean,
+    
+    [Parameter(Mandatory=$false)]
+    [Switch]$release,
 
     [Parameter(Mandatory=$false)]
     [Switch] $help
@@ -26,7 +29,7 @@ if ($qmodName -eq "")
     exit
 }
 
-& $PSScriptRoot/build.ps1 -clean:$clean
+& $PSScriptRoot/build.ps1 -clean:$clean -release:$release
 
 if ($LASTEXITCODE -ne 0) {
     Write-Output "Failed to build, exiting..."
diff --git a/include/BeatSaverRegionManager.hpp b/include/BeatSaverRegionManager.hpp
index 9633fc5..f6ebd67 100644
--- a/include/BeatSaverRegionManager.hpp
+++ b/include/BeatSaverRegionManager.hpp
@@ -1,27 +1,25 @@
 #pragma once
 
-#include "main.hpp"
+#include <future>
+
+#include "logging.hpp"
 #include "uri.hh"
 #include "web-utils/shared/WebUtils.hpp"
-#include "logging.hpp"
-#include <future>
 
-using namespace WebUtils;
 class BeatSaverRegionManager {
-    public:
-        static inline const std::string mapDownloadUrlFallback = "https://cdn.beatsaver.com";
-        static inline const std::string detailsDownloadUrl = "https://api.beatsaver.com/maps/id/";
-
-        static inline std::string mapDownloadUrl = "https://r2cdn.beatsaver.com";
-        static inline std::string coverDownloadUrl = "https://cdn.beatsaver.com";
-        static inline std::string previewDownloadUrl  = "https://cdn.beatsaver.com";
+   public:
+    static inline std::string const mapDownloadUrlFallback = "https://cdn.beatsaver.com";
+    static inline std::string const detailsDownloadUrl = "https://api.beatsaver.com/maps/id/";
 
-        static inline bool didTheThing = false;
+    static inline std::string mapDownloadUrl = "https://r2cdn.beatsaver.com";
+    static inline std::string coverDownloadUrl = "https://cdn.beatsaver.com";
+    static inline std::string previewDownloadUrl = "https://cdn.beatsaver.com";
 
+    static inline bool didTheThing = false;
 
     static void GetSongDescription(std::string key, std::function<void(std::string)> finished) {
         std::thread([key, finished]() mutable {
-            auto result = Get<JsonResponse>(URLOptions(detailsDownloadUrl + key));
+            auto result = Get<WebUtils::JsonResponse>(WebUtils::URLOptions(detailsDownloadUrl + key));
 
             if (result.IsSuccessful()) {
                 if (result.responseData.has_value()) {
@@ -34,28 +32,25 @@ class BeatSaverRegionManager {
     }
 
     static void RegionLookup(bool force = false) {
-            if(didTheThing && !force)
-                return;
-
-            
-            didTheThing = true;
-            std::thread([]() {
-                auto response = Get<JsonResponse>(URLOptions(detailsDownloadUrl + "225eb"));
-
-                if (response.IsSuccessful()) {
-                    if (response.responseData.has_value()) {
-                        auto& value = response.responseData.value();
-                        std::string joe = value["versions"].GetArray()[0]["coverURL"].GetString();
-                        if(joe.length() > 0) {
-                            uri u(joe);
-                            coverDownloadUrl = previewDownloadUrl = fmt::format("{}://{}", u.get_scheme(), u.get_host());
-                            return;
-                        }
+        if (didTheThing && !force) {
+            return;
+        }
+
+        didTheThing = true;
+        std::thread([]() {
+            auto response = Get<WebUtils::JsonResponse>(WebUtils::URLOptions(detailsDownloadUrl + "225eb"));
+
+            if (response.IsSuccessful()) {
+                if (response.responseData.has_value()) {
+                    auto& value = response.responseData.value();
+                    std::string joe = value["versions"].GetArray()[0]["coverURL"].GetString();
+                    if (joe.length() > 0) {
+                        uri u(joe);
+                        coverDownloadUrl = previewDownloadUrl = fmt::format("{}://{}", u.get_scheme(), u.get_host());
+                        return;
                     }
                 }
-            }).detach();
-            
-        }
+            }
+        }).detach();
+    }
 };
-
-
diff --git a/include/DataHolder.hpp b/include/DataHolder.hpp
new file mode 100644
index 0000000..8004abf
--- /dev/null
+++ b/include/DataHolder.hpp
@@ -0,0 +1,89 @@
+#pragma once
+
+#include <unordered_map>
+#include <vector>
+
+#include "FilterOptions.hpp"
+#include "GlobalNamespace/PlayerData.hpp"
+#include "GlobalNamespace/PlayerDataModel.hpp"
+#include "song-details/shared/Data/MapCharacteristic.hpp"
+#include "song-details/shared/Data/Song.hpp"
+#include "song-details/shared/Data/SongDifficulty.hpp"
+#include "song-details/shared/SongDetails.hpp"
+
+/*
+    Global data holder for the mod to simplify access to global data
+*/
+namespace BetterSongSearch {
+
+    struct PreprocessedTag {
+        std::string tag;
+        uint64_t mask;
+        uint32_t songCount;
+        bool isStyle;
+    };
+
+    // Global variables
+    class DataHolder {
+       public:
+        DataHolder() = default;  // Default constructor
+        DataHolder(DataHolder const&) = delete;  // Disable copy constructor
+        SongDetailsCache::SongDetails* songDetails = nullptr;  // Song details cache
+
+        // Events
+        UnorderedEventCallback<> loadingFinished;  // Gets called when the loading is done
+        UnorderedEventCallback<std::string> loadingFailed;  // Gets called when the loading failed with the error message
+        UnorderedEventCallback<> playerDataLoaded;  // Callback when we process more player data
+        UnorderedEventCallback<> searchEnded;  // Callback when the search is done and we have the results
+
+        std::vector<PreprocessedTag> tags = {};  // Preprocessed tags for filter UI
+        std::unordered_map<std::string, uint64_t> tagMap = {};
+
+        // Allow to force reload the song list
+        bool forceReload = false;
+
+        std::vector<SongDetailsCache::Song const*> filteredSongList;  // Filtered songs
+        std::vector<SongDetailsCache::Song const*> searchedSongList;  // Searched songs
+        std::vector<SongDetailsCache::Song const*> displayedSongList;  // Sorted songs (actually displayed)
+
+        FilterTypes::SortMode sort = (FilterTypes::SortMode) 0;  // UI sort state
+        FilterTypes::SortMode currentSort = FilterTypes::SortMode::Newest;  // Current search sort state
+        std::string search;  // UI search string
+        std::string currentSearch;  // Current search string
+
+        FilterProfile filterOptions;  // Filter options tied to ui
+        FilterProfile filterOptionsCache;  // Filter options for the current search
+
+        /// @brief Player data model to get the scores (can easily be null)
+        UnityW<GlobalNamespace::PlayerDataModel> playerDataModel = nullptr;
+
+        FilterTypes::PreferredLeaderBoard preferredLeaderboard = FilterTypes::PreferredLeaderBoard::ScoreSaber;
+
+        bool loaded = false;
+        bool failed = false;
+        bool loading = false;
+        bool needsRefresh = false;  // Song list needs to be refreshed when shown
+        bool searchInProgress = false;
+
+        /// @brief Initializes the data holder and starts loading the song data and subscribing to the events
+        void Init();
+        void DownloadSongList();
+        void PreprocessTags();
+        void UpdatePlayerScores();
+        bool SongHasScore(SongDetailsCache::Song const* song);
+        bool SongHasScore(std::string_view songhash);
+        void Search();
+        /// @brief Called when the song list UI is done updating the song list
+        void SongListUIDone();
+
+       private:
+        std::shared_mutex mutex_songsWithScores;
+        std::unordered_set<std::string> songsWithScores;  // Songs with scores (hashes) for played songs filtering
+
+        void SongDataDone();
+        void SongDataError(std::string message);
+    };
+
+    // Instance of the data holder
+    extern DataHolder dataHolder;
+}  // namespace BetterSongSearch
diff --git a/include/DateUtils.hpp b/include/DateUtils.hpp
index d70f57c..db7d667 100644
--- a/include/DateUtils.hpp
+++ b/include/DateUtils.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
-using namespace std::chrono;
+#include <chrono>
+#include <string>
 
-namespace BetterSongSearch
-{
-    int GetMonthsSinceDate(int64_t since)
-    {
+namespace BetterSongSearch {
+    int GetMonthsSinceDate(int64_t since) {
         auto currentEpoch = std::chrono::system_clock::now().time_since_epoch();
         auto epoch2 = std::chrono::seconds(since);
         auto monthsSince = std::chrono::duration_cast<std::chrono::months>(currentEpoch - epoch2);
@@ -13,32 +12,31 @@ namespace BetterSongSearch
     }
 
     // Add calendar months to a date
-    system_clock::time_point GetTimepointAfterMonths(int64_t sinceEpoch, int64_t addMonths)
-    {
+    std::chrono::system_clock::time_point GetTimepointAfterMonths(int64_t sinceEpoch, int64_t addMonths) {
         std::chrono::seconds tp(sinceEpoch);
 
         // Get timepoint
-        system_clock::time_point timePoint{tp};
-        auto sd = floor<days>(tp);
+        std::chrono::system_clock::time_point timePoint{tp};
+        auto sd = floor<std::chrono::days>(tp);
         // Record the time of day
         auto time_of_day = tp - sd;
         // Convert to a y/m/d calendar data structure
-        year_month_day ymd{(sys_days)sd};
+        std::chrono::year_month_day ymd{(std::chrono::sys_days) sd};
         // Add the months
-        ymd += months{addMonths};
+        ymd += std::chrono::months{addMonths};
         // Add some policy for overflowing the day-of-month if desired
-        if (!ymd.ok())
-            ymd = ymd.year() / ymd.month() / last;
+        if (!ymd.ok()) {
+            ymd = ymd.year() / ymd.month() / std::chrono::last;
+        }
         // Convert back to system_clock::time_point
-        return sys_days{ymd} + time_of_day;
+        return std::chrono::sys_days{ymd} + time_of_day;
     }
 
     // Add calendar months to a date
-    seconds GetDateAfterMonths(int64_t sinceEpoch, int64_t addMonths)
-    {
+    std::chrono::seconds GetDateAfterMonths(int64_t sinceEpoch, int64_t addMonths) {
         auto timepoint = GetTimepointAfterMonths(sinceEpoch, addMonths);
 
-        return duration_cast<seconds>(timepoint.time_since_epoch());
+        return duration_cast<std::chrono::seconds>(timepoint.time_since_epoch());
     }
 
-}
\ No newline at end of file
+}  // namespace BetterSongSearch
diff --git a/include/FilterOptions.hpp b/include/FilterOptions.hpp
index 525b23a..889373b 100644
--- a/include/FilterOptions.hpp
+++ b/include/FilterOptions.hpp
@@ -1,261 +1,112 @@
 #pragma once
 
 #include <vector>
-#include <limits>
-#include "main.hpp"
-#include "song-details/shared/Data/MapCharacteristic.hpp"
-#include "song-details/shared/Data/MapDifficulty.hpp"
-#include "song-details/shared/Data/RankedStates.hpp"
-#include "song-details/shared/Data/MapMods.hpp"
-#include "song-details/shared/Data/SongDifficulty.hpp"
-
-
-
-class FilterOptions
-{
-public:
-    // FilterOptions(FilterOptions const&) = delete; // no accidental copying
-    // FilterOptions() = default;
-
-    enum class DownloadFilterType
-    {
-        All,
-        OnlyDownloaded,
-        HideDownloaded
-    };
-    enum class LocalScoreFilterType
-    {
-        All,
-        HidePassed,
-        OnlyPassed
-    };
-    enum class RankedFilterType
-    {
-        ShowAll,
-        ScoreSaberRanked,
-        BeatLeaderRanked,
-        ScoreSaberQualified,
-        BeatLeaderQualified
-    };
-    enum class DifficultyFilterType
-    {
-        All,
-        Easy,
-        Normal,
-        Hard,
-        Expert,
-        ExpertPlus
-    };
-    enum class CharFilterType
-    {
-        All,
-        Custom,
-        Standard,
-        OneSaber,
-        NoArrows,
-        NinetyDegrees,
-        ThreeSixtyDegrees,
-        LightShow,
-        Lawless,
-    };
-
-    enum class RequirementType {
-        Any,
-        NoodleExtensions,
-        MappingExtensions,
-        Chroma,
-        Cinema,
-        None
-    };
-
-    static inline const float SONG_LENGTH_FILTER_MAX = 15.0f;
-    static inline const float STAR_FILTER_MAX = 18.0f;
-    static inline const float NJS_FILTER_MAX = 25.0f;
-    static inline const float NPS_FILTER_MAX = 12.0f;
-    static inline const int64_t BEATSAVER_EPOCH = 1525136400;
-
-    //General
-    DownloadFilterType downloadType = DownloadFilterType::All;
-    LocalScoreFilterType localScoreType = LocalScoreFilterType::All;
-    float minLength = 0, maxLength = 900;
-
-    //Mapping
-    float minNJS = 0, maxNJS = NJS_FILTER_MAX;
-    float minNPS = 0, maxNPS = NPS_FILTER_MAX;
-
-    // Ranked
-    RankedFilterType rankedType = RankedFilterType::ShowAll;
-    float minStars = 0, maxStars = STAR_FILTER_MAX;
-
-    //BeatSaver
-    int minUploadDate = BEATSAVER_EPOCH;
-    int minUploadDateInMonths = 0;
-    float minRating = 0;
-    int minVotes = 0;
-    std::vector<std::string> uploaders;
-    bool uploadersBlackList = false;
-
-    //Difficulty
-    DifficultyFilterType difficultyFilter = DifficultyFilterType::All;
-    CharFilterType charFilter = CharFilterType::All;
-
-    //Mods
-    RequirementType modRequirement = RequirementType::Any;
-};
-
-enum class SortMode {
-    Newest,
-    Oldest,
-    Latest_Ranked,
-    Most_Stars,
-    Least_Stars,
-    Best_rated,
-    Worst_rated
-};
-
-enum class PreferredLeaderBoard {
-    ScoreSaber = 0,
-    BeatLeader = 1
-};
-
-
-
-// Map for characteristics
-static const std::unordered_map<FilterOptions::CharFilterType, SongDetailsCache::MapCharacteristic> charMap = {
-    {FilterOptions::CharFilterType::Custom, SongDetailsCache::MapCharacteristic::Custom},
-    {FilterOptions::CharFilterType::Standard, SongDetailsCache::MapCharacteristic::Standard},
-    {FilterOptions::CharFilterType::OneSaber, SongDetailsCache::MapCharacteristic::OneSaber},
-    {FilterOptions::CharFilterType::NoArrows, SongDetailsCache::MapCharacteristic::NoArrows},
-    {FilterOptions::CharFilterType::NinetyDegrees, SongDetailsCache::MapCharacteristic::NinetyDegree},
-    {FilterOptions::CharFilterType::ThreeSixtyDegrees, SongDetailsCache::MapCharacteristic::ThreeSixtyDegree},
-    {FilterOptions::CharFilterType::LightShow, SongDetailsCache::MapCharacteristic::LightShow},
-    {FilterOptions::CharFilterType::Lawless, SongDetailsCache::MapCharacteristic::Lawless}
-};
-
-// Map for difficulties
-static const std::unordered_map<FilterOptions::DifficultyFilterType, SongDetailsCache::MapDifficulty> diffMap = {
-    {FilterOptions::DifficultyFilterType::Easy, SongDetailsCache::MapDifficulty::Easy},
-    {FilterOptions::DifficultyFilterType::Normal, SongDetailsCache::MapDifficulty::Normal},
-    {FilterOptions::DifficultyFilterType::Hard, SongDetailsCache::MapDifficulty::Hard},
-    {FilterOptions::DifficultyFilterType::Expert, SongDetailsCache::MapDifficulty::Expert},
-    {FilterOptions::DifficultyFilterType::ExpertPlus, SongDetailsCache::MapDifficulty::ExpertPlus}
-};
-
-
-// Map for ranked states
-static const std::unordered_map<FilterOptions::RankedFilterType, SongDetailsCache::RankedStates> rankMap = {
-    {FilterOptions::RankedFilterType::ScoreSaberRanked, SongDetailsCache::RankedStates::ScoresaberRanked},
-    {FilterOptions::RankedFilterType::BeatLeaderRanked, SongDetailsCache::RankedStates::BeatleaderRanked},
-    {FilterOptions::RankedFilterType::ScoreSaberQualified, SongDetailsCache::RankedStates::ScoresaberQualified},
-    {FilterOptions::RankedFilterType::BeatLeaderQualified, SongDetailsCache::RankedStates::BeatleaderQualified}
-};
-
-// Map for preferred leaderboard
-static const std::unordered_map<std::string, PreferredLeaderBoard> leaderBoardMap = {
-    {"Scoresaber", PreferredLeaderBoard::ScoreSaber},
-    {"Beatleader", PreferredLeaderBoard::BeatLeader}
-};
-
-class FilterOptionsCache
-{
-public:
-    FilterOptionsCache(FilterOptionsCache const&) = delete; // no accidental copying
-    FilterOptionsCache() = default;
-   
-    void cache(FilterOptions s){
-        downloadType=s.downloadType;
-        localScoreType=s.localScoreType;
-        minLength=s.minLength;
-        if (s.maxLength / 60 >= FilterOptions::SONG_LENGTH_FILTER_MAX) { maxLength=std::numeric_limits<float>::infinity(); } else { maxLength=s.maxLength;}
-        minNJS=s.minNJS;
-        if (s.maxNJS >= FilterOptions::NJS_FILTER_MAX) { maxNJS=std::numeric_limits<float>::infinity(); } else { maxNJS=s.maxNJS;}
-        minNPS=s.minNPS;
-        if (s.maxNPS >= FilterOptions::NPS_FILTER_MAX) { maxNPS=std::numeric_limits<float>::infinity(); } else { maxNPS=s.maxNPS;}
-        rankedType=s.rankedType;
-        minStars=s.minStars;
-        if (s.maxStars >= FilterOptions::STAR_FILTER_MAX) { maxStars=std::numeric_limits<float>::infinity(); } else { maxStars=s.maxStars;}
-        minUploadDate=s.minUploadDate;
-        minRating=s.minRating;
-        minVotes=s.minVotes;
-        uploaders=s.uploaders;
-        uploadersBlackList=s.uploadersBlackList;
-        difficultyFilter=s.difficultyFilter;
-        charFilter=s.charFilter;
-        modRequirement=s.modRequirement;
-
-        // Process char filter
-        if (s.charFilter != FilterOptions::CharFilterType::All) {
-            charFilterPreprocessed = charMap.at(s.charFilter);
-        };
-
-        // Map difficulty filter
-        if (s.difficultyFilter != FilterOptions::DifficultyFilterType::All) {
-            difficultyFilterPreprocessed = diffMap.at(s.difficultyFilter);
-        };
-
-        // Check if filter is needed at all
-        skipFilter = false; 
-        skipFilter = (
-            downloadType == FilterOptions::DownloadFilterType::All &&
-            localScoreType ==  FilterOptions::LocalScoreFilterType::All &&
-            (s.maxLength / 60 >= FilterOptions::SONG_LENGTH_FILTER_MAX) && 
-            (s.minLength == 0) &&
-            minNJS == 0 && 
-            s.maxNJS >= FilterOptions::NJS_FILTER_MAX &&
-            s.minNPS == 0 &&
-            s.maxNPS >= FilterOptions::NPS_FILTER_MAX && 
-            rankedType == FilterOptions::RankedFilterType::ShowAll &&
-            minStars == 0 &&
-            s.maxStars >= FilterOptions::STAR_FILTER_MAX &&
-            s.minUploadDateInMonths == 0 &&
-            minRating == 0 &&
-            minVotes == 0 &&
-            uploaders.size() == 0 &&
-            difficultyFilter == FilterOptions::DifficultyFilterType::All &&
-            charFilter == FilterOptions::CharFilterType::All &&
-            modRequirement == FilterOptions::RequirementType::Any
-        );
-
-        // Do infinity checks for songs that are out of bounds
-        if (s.maxStars >= FilterOptions::STAR_FILTER_MAX) { maxStars=std::numeric_limits<float>::infinity(); }
-        if (s.maxNJS >= FilterOptions::NJS_FILTER_MAX) { maxNJS=std::numeric_limits<float>::infinity(); }
-        if (s.maxNPS >= FilterOptions::NPS_FILTER_MAX) { maxNPS=std::numeric_limits<float>::infinity(); }
-        if (s.maxLength / 60 >= FilterOptions::SONG_LENGTH_FILTER_MAX) { maxLength=std::numeric_limits<float>::infinity(); }
-    }
-
-    bool skipFilter = false;
-    
-
-    //General
-    FilterOptions::DownloadFilterType downloadType = FilterOptions::DownloadFilterType::All;
-    FilterOptions::LocalScoreFilterType localScoreType = FilterOptions::LocalScoreFilterType::All;
-    float minLength = 0, maxLength = 900;
-
-    //Mapping
-    float minNJS = 0, maxNJS = FilterOptions::NJS_FILTER_MAX;
-    float minNPS = 0, maxNPS = FilterOptions::NPS_FILTER_MAX;
-
-    //ScoreSaber
-    FilterOptions::RankedFilterType rankedType = FilterOptions::RankedFilterType::ShowAll;
-    float minStars = 0, maxStars = FilterOptions::STAR_FILTER_MAX;
-
-    //BeatSaver
-    int minUploadDate = FilterOptions::BEATSAVER_EPOCH;
-    float minRating = 0;
-    int minVotes = 0;
-    std::vector<std::string> uploaders;
-    bool uploadersBlackList = false;
-
-    //Difficulty
-    FilterOptions::DifficultyFilterType difficultyFilter = FilterOptions::DifficultyFilterType::All;
-    SongDetailsCache::MapDifficulty difficultyFilterPreprocessed;
-
-
-    /// @brief Char filter for gui
-    FilterOptions::CharFilterType charFilter = FilterOptions::CharFilterType::All;
-    /// @brief Used to speedup filtering, only if not All
-    SongDetailsCache::MapCharacteristic charFilterPreprocessed = SongDetailsCache::MapCharacteristic::Custom;
-
-    //Mods
-    FilterOptions::RequirementType modRequirement = FilterOptions::RequirementType::Any;
-};
+#include <tuple>
+
+#include "rapidjson-macros/shared/macros.hpp"
+#include "PluginConfig.hpp"
+
+namespace BetterSongSearch {
+    DECLARE_JSON_CLASS(FilterProfile,
+        VALUE_DEFAULT(int, downloadType, (int)FilterTypes::DownloadFilter::All);
+        VALUE_DEFAULT(int, localScoreType, (int)FilterTypes::LocalScoreFilter::All);
+        VALUE_DEFAULT(int, rankedType, (int)FilterTypes::RankedFilter::ShowAll);
+        VALUE_DEFAULT(int, difficultyFilter, (int)FilterTypes::DifficultyFilter::All);
+        VALUE_DEFAULT(int, charFilter, (int)FilterTypes::CharFilter::All);
+        VALUE_DEFAULT(int, modRequirement, (int)FilterTypes::Requirement::Any);
+
+        VALUE_DEFAULT(float, minLength, 0);
+        VALUE_DEFAULT(float, maxLength, 900);
+        VALUE_DEFAULT(float, minNJS, 0);
+        VALUE_DEFAULT(float, maxNJS, NJS_FILTER_MAX);
+        VALUE_DEFAULT(float, minNPS, 0);
+        VALUE_DEFAULT(float, maxNPS, NPS_FILTER_MAX);
+
+        VALUE_DEFAULT(float, minStars, 0);
+        VALUE_DEFAULT(float, maxStars, STAR_FILTER_MAX);
+        VALUE_DEFAULT(int, minUploadDate, BEATSAVER_EPOCH);
+        VALUE_DEFAULT(int, minUploadDateInMonths, 0);
+        VALUE_DEFAULT(float, minRating, 0);
+        VALUE_DEFAULT(int, minVotes, 0);
+
+        VECTOR_DEFAULT(std::string, uploaders, {});
+        VALUE_DEFAULT(bool, uploadersBlackList, false);
+
+        VALUE_DEFAULT(bool, onlyCuratedMaps, false);
+        VALUE_DEFAULT(bool, onlyVerifiedMappers, false);
+        VALUE_DEFAULT(bool, onlyV3Maps, false);
+
+        VALUE_DEFAULT(std::string, mapStyleString, "All");
+        VALUE_DEFAULT(std::string, mapGenreString, "");
+        VALUE_DEFAULT(std::string, mapGenreExcludeString, "");
+
+        public:
+            bool IsEqual(const FilterProfile& other) const;
+
+            // Because RapidJSON does not support enums... we have to make methods to convert them to/from int
+            FilterTypes::DownloadFilter getDownloadType() { return (FilterTypes::DownloadFilter) downloadType; };
+            FilterTypes::LocalScoreFilter getLocalScoreType() { return (FilterTypes::LocalScoreFilter) localScoreType; };
+            FilterTypes::RankedFilter getRankedType() { return (FilterTypes::RankedFilter) rankedType; };
+            FilterTypes::DifficultyFilter getDifficultyFilter() { return (FilterTypes::DifficultyFilter) difficultyFilter; };
+            FilterTypes::CharFilter getCharFilter() { return (FilterTypes::CharFilter) charFilter; };
+            FilterTypes::Requirement getModRequirement() { return (FilterTypes::Requirement) modRequirement; };
+            void setDownloadType(FilterTypes::DownloadFilter value) { downloadType = (int) value; };
+            void setLocalScoreType(FilterTypes::LocalScoreFilter value) { localScoreType = (int) value; };
+            void setRankedType(FilterTypes::RankedFilter value) { rankedType = (int) value; };
+            void setDifficultyFilter(FilterTypes::DifficultyFilter value) { difficultyFilter = (int) value; };
+            void setCharFilter(FilterTypes::CharFilter value) { charFilter = (int) value; };
+            void setModRequirement(FilterTypes::Requirement value) { modRequirement = (int) value; };
+
+
+            // This value is valid only if the related filter is not set to "All" and recalculated
+            SongDetailsCache::MapCharacteristic charFilterPreprocessed = SongDetailsCache::MapCharacteristic::Custom;
+            // This value is valid only if the related filter is not set to "All" and recalculated
+            SongDetailsCache::MapDifficulty difficultyFilterPreprocessed = SongDetailsCache::MapDifficulty::Easy;
+
+            uint64_t _mapStyleBitfield = 0;
+            uint64_t _mapGenreBitfield = 0;
+            uint64_t _mapGenreExcludeBitfield = 0;
+
+            bool isDefaultPreprocessed = true;
+
+            // @brief Checks if the profile is the default profile (no filters)
+            bool IsDefault();
+
+            // @brief Recalculates preprocessed values (variables that are used in search)
+            void RecalculatePreprocessedValues();
+
+            // @brief Loads the profile from the mod config
+            void LoadFromConfig();
+
+            // @brief Saves the profile to the mod config
+            void SaveToConfig();
+
+            void PrintToDebug();
+
+
+            // @brief Counts the included and excluded tags in the profile
+            // @return A tuple with the count of included and excluded tags
+            std::tuple<int, int> CountTags();
+
+            // @brief Saves the profile to a preset
+            // @param presetName The name of the preset to save
+            // @return True if the preset was saved successfully
+            bool SaveToPreset(std::string presetName) const;
+
+            // @brief Deletes a preset
+            // @param presetName The name of the preset to delete
+            // @return True if the preset was deleted successfully
+            static bool DeletePreset(std::string presetName);
+
+            // @brief Gets a list of all available presets
+            // @return A list of all available presets
+            static std::vector<std::string> GetPresetList();
+
+            // @brief Loads the profile from a preset
+            // @param presetName The name of the preset to load
+            // @return The loaded profile
+            static std::optional<FilterProfile> LoadFromPreset(std::string presetName);
+
+            void CopyFrom(const FilterProfile& other);
+    )
+}
diff --git a/include/FormatUtils.hpp b/include/FormatUtils.hpp
index e46574e..5fe8132 100644
--- a/include/FormatUtils.hpp
+++ b/include/FormatUtils.hpp
@@ -1,4 +1,4 @@
 #pragma once
 
 namespace BetterSongSearch {
-}
\ No newline at end of file
+}
diff --git a/include/Formatters.hpp b/include/Formatters.hpp
new file mode 100644
index 0000000..1fa0a30
--- /dev/null
+++ b/include/Formatters.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include <string>
+#include "bsml/shared/BSML/Components/Settings/IncrementSetting.hpp"
+
+namespace BetterSongSearch::Formatters {
+    StringW FormatMapStyle(StringW value);
+}
diff --git a/include/PluginConfig.hpp b/include/PluginConfig.hpp
index 36f9ec4..6d1f231 100644
--- a/include/PluginConfig.hpp
+++ b/include/PluginConfig.hpp
@@ -1,15 +1,131 @@
 #pragma once
 
-#include "config-utils/shared/config-utils.hpp"
-
 #include <string>
 #include <unordered_map>
 
-#include "FilterOptions.hpp"
-#include "main.hpp"
+#include "song-details/shared/Data/MapCharacteristic.hpp"
+#include "song-details/shared/Data/MapDifficulty.hpp"
+#include "song-details/shared/Data/RankedStates.hpp"
+#include "song-details/shared/Data/SongDifficulty.hpp"
 
-DECLARE_CONFIG(PluginConfig,
+#include "config-utils/shared/config-utils.hpp"
+
+static inline const float SONG_LENGTH_FILTER_MAX = 15.0f;
+static inline const float STAR_FILTER_MAX = 18.0f;
+static inline const float NJS_FILTER_MAX = 25.0f;
+static inline const float NPS_FILTER_MAX = 12.0f;
+static inline const int64_t BEATSAVER_EPOCH = 1525136400;
+static inline const std::chrono::system_clock::time_point BEATSAVER_EPOCH_TIME_POINT{std::chrono::seconds(BEATSAVER_EPOCH)};
+
+static inline const std::vector<std::string> MAP_STYLES_OPTIONS = {
+    "Any", "accuracy", "balanced", "challenge", "dance", "fitness", "speed", "tech"
+};
+
+namespace FilterTypes {
+    enum class DownloadFilter
+    {
+        All,
+        OnlyDownloaded,
+        HideDownloaded
+    };
+    enum class LocalScoreFilter
+    {
+        All,
+        HidePassed,
+        OnlyPassed
+    };
+    enum class RankedFilter
+    {
+        ShowAll,
+        ScoreSaberRanked,
+        BeatLeaderRanked,
+        ScoreSaberQualified,
+        BeatLeaderQualified
+    };
+    enum class DifficultyFilter
+    {
+        All,
+        Easy,
+        Normal,
+        Hard,
+        Expert,
+        ExpertPlus
+    };
+    enum class CharFilter
+    {
+        All,
+        Custom,
+        Standard,
+        OneSaber,
+        NoArrows,
+        NinetyDegrees,
+        ThreeSixtyDegrees,
+        LightShow,
+        Lawless,
+    };
+
+    enum class Requirement {
+        Any,
+        NoodleExtensions,
+        MappingExtensions,
+        Chroma,
+        Cinema,
+        None
+    };
 
+    enum class SortMode {
+        Newest,
+        Oldest,
+        Latest_Ranked,
+        Most_Stars,
+        Least_Stars,
+        Best_rated,
+        Worst_rated
+    };
+
+    enum class PreferredLeaderBoard {
+        ScoreSaber = 0,
+        BeatLeader = 1
+    };
+
+}
+
+// Map for characteristics
+static const std::unordered_map<FilterTypes::CharFilter, SongDetailsCache::MapCharacteristic> CHARACTERISTIC_MAP = {
+    {FilterTypes::CharFilter::Custom, SongDetailsCache::MapCharacteristic::Custom},
+    {FilterTypes::CharFilter::Standard, SongDetailsCache::MapCharacteristic::Standard},
+    {FilterTypes::CharFilter::OneSaber, SongDetailsCache::MapCharacteristic::OneSaber},
+    {FilterTypes::CharFilter::NoArrows, SongDetailsCache::MapCharacteristic::NoArrows},
+    {FilterTypes::CharFilter::NinetyDegrees, SongDetailsCache::MapCharacteristic::NinetyDegree},
+    {FilterTypes::CharFilter::ThreeSixtyDegrees, SongDetailsCache::MapCharacteristic::ThreeSixtyDegree},
+    {FilterTypes::CharFilter::LightShow, SongDetailsCache::MapCharacteristic::LightShow},
+    {FilterTypes::CharFilter::Lawless, SongDetailsCache::MapCharacteristic::Lawless}
+};
+
+// Map for difficulties
+static const std::unordered_map<FilterTypes::DifficultyFilter, SongDetailsCache::MapDifficulty> DIFFICULTY_MAP = {
+    {FilterTypes::DifficultyFilter::Easy, SongDetailsCache::MapDifficulty::Easy},
+    {FilterTypes::DifficultyFilter::Normal, SongDetailsCache::MapDifficulty::Normal},
+    {FilterTypes::DifficultyFilter::Hard, SongDetailsCache::MapDifficulty::Hard},
+    {FilterTypes::DifficultyFilter::Expert, SongDetailsCache::MapDifficulty::Expert},
+    {FilterTypes::DifficultyFilter::ExpertPlus, SongDetailsCache::MapDifficulty::ExpertPlus}
+};
+
+// Map for ranked states
+static const std::unordered_map<FilterTypes::RankedFilter, SongDetailsCache::RankedStates> RANK_MAP = {
+    {FilterTypes::RankedFilter::ScoreSaberRanked, SongDetailsCache::RankedStates::ScoresaberRanked},
+    {FilterTypes::RankedFilter::BeatLeaderRanked, SongDetailsCache::RankedStates::BeatleaderRanked},
+    {FilterTypes::RankedFilter::ScoreSaberQualified, SongDetailsCache::RankedStates::ScoresaberQualified},
+    {FilterTypes::RankedFilter::BeatLeaderQualified, SongDetailsCache::RankedStates::BeatleaderQualified}
+};
+
+// Map for preferred leaderboard
+static const std::unordered_map<std::string, FilterTypes::PreferredLeaderBoard> LEADERBOARD_MAP = {
+    {"Scoresaber", FilterTypes::PreferredLeaderBoard::ScoreSaber},
+    {"Beatleader", FilterTypes::PreferredLeaderBoard::BeatLeader}
+};
+
+DECLARE_CONFIG(PluginConfig,
     CONFIG_VALUE(ReturnToBSS, bool, "Return to BSS from Solo", true);
     CONFIG_VALUE(LoadSongPreviews, bool, "Load song previews", true);
     CONFIG_VALUE(SmallerFontSize, bool, "Smaller font size", true);
@@ -19,14 +135,14 @@ DECLARE_CONFIG(PluginConfig,
     CONFIG_VALUE(MinLength, float, "Minimum Song Length", 0);
     CONFIG_VALUE(MaxLength, float, "Maximum Song Length", 900);
     CONFIG_VALUE(MinNJS, float, "Minimum Note Jump Speed", 0);
-    CONFIG_VALUE(MaxNJS, float, "Maximum Note Jump Speed", 25);
+    CONFIG_VALUE(MaxNJS, float, "Maximum Note Jump Speed", NJS_FILTER_MAX);
     CONFIG_VALUE(MinNPS, float, "Minimum Notes Per Second", 0);
-    CONFIG_VALUE(MaxNPS, float, "Maximum Note Per Second", 12);
+    CONFIG_VALUE(MaxNPS, float, "Maximum Note Per Second", NPS_FILTER_MAX);
     CONFIG_VALUE(RankedType, int, "Ranked Type", 0);
     CONFIG_VALUE(MinStars, float, "Minimum Ranked Stars", 0);
-    CONFIG_VALUE(MaxStars, float, "Maximum Ranked Stars", 18);
+    CONFIG_VALUE(MaxStars, float, "Maximum Ranked Stars", STAR_FILTER_MAX);
     CONFIG_VALUE(MinUploadDateInMonths, int, "Minimum Upload Date In Months", 0); //TEMPORARY UNTIL I FIX CONVERTING UNIX -> MONTHS SINCE BEAT SAVER
-    CONFIG_VALUE(MinUploadDate, int, "Minimum Upload Date", FilterOptions::BEATSAVER_EPOCH);
+    CONFIG_VALUE(MinUploadDate, int, "Minimum Upload Date", BEATSAVER_EPOCH);
     CONFIG_VALUE(MinRating, float, "Minimum Rating", 0);
     CONFIG_VALUE(MinVotes, int, "Minimum Votes", 0);
     CONFIG_VALUE(DifficultyType, int, "Difficulty Type", 0);
@@ -34,4 +150,10 @@ DECLARE_CONFIG(PluginConfig,
     CONFIG_VALUE(Uploaders, std::string, "Uploaders filter", "");
     CONFIG_VALUE(RequirementType, int, "Requirement Type", 0);
     CONFIG_VALUE(PreferredLeaderboard, std::string, "Preferred Leaderboard", "Scoresaber");
-)
\ No newline at end of file
+    CONFIG_VALUE(OnlyVerifiedMappers, bool, "Only Verified Mappers", false);
+    CONFIG_VALUE(OnlyCuratedMaps, bool, "Only Curated Maps", false);
+    CONFIG_VALUE(OnlyV3Maps, bool, "Only V3 Maps", false);
+    CONFIG_VALUE(MapStyleString, std::string, "Map Style", "All");
+    CONFIG_VALUE(MapGenreString, std::string, "Map Genres", "");
+    CONFIG_VALUE(MapGenreExcludeString, std::string, "Map Genre Exclude", "");
+)
diff --git a/include/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp b/include/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp
index bf6f16e..6225322 100644
--- a/include/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp
+++ b/include/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp
@@ -9,8 +9,6 @@
 #include "UI/ViewControllers/FilterView.hpp"
 #include "UI/ViewControllers/DownloadHistory.hpp"
 
-using namespace BetterSongSearch::UI;
-#define GET_FIND_METHOD(mPtr) il2cpp_utils::il2cpp_type_check::MetadataGetter<mPtr>::get()
 
 DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::FlowCoordinators, BetterSongSearchFlowCoordinator, HMUI::FlowCoordinator,
     DECLARE_INSTANCE_FIELD(UnityW<ViewControllers::SongListController>, SongListController);
diff --git a/include/UI/Manager.hpp b/include/UI/Manager.hpp
index 7377d62..9e370d4 100644
--- a/include/UI/Manager.hpp
+++ b/include/UI/Manager.hpp
@@ -9,15 +9,11 @@
 #include "UnityEngine/UI/Button.hpp"
 #include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
 
-using namespace BetterSongSearch::UI;
-using namespace BetterSongSearch::Util;
-using namespace GlobalNamespace;
-
 namespace BetterSongSearch::UI {
     class Manager
     {
         HMUI::FlowCoordinator* parentFlow;
-        SafePtrUnity<BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator> flow;
+        UnityW<BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator> flow;
         BSML::MenuButton * menuButton;
         
 
@@ -35,6 +31,7 @@ namespace BetterSongSearch::UI {
             void Close(bool immediately = false, bool downloadAbortConfim = true);
 
             void GoToSongSelect();
+            void DestroyFlow();
     };
 
 
diff --git a/include/UI/Modals/GenrePicker.hpp b/include/UI/Modals/GenrePicker.hpp
new file mode 100644
index 0000000..c884d46
--- /dev/null
+++ b/include/UI/Modals/GenrePicker.hpp
@@ -0,0 +1,62 @@
+#pragma once
+
+#include "HMUI/ViewController.hpp"
+#include "bsml/shared/macros.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "HMUI/ModalView.hpp"
+#include "HMUI/TableView.hpp"
+#include "bsml/shared/BSML/Components/Settings/SliderSetting.hpp"
+#include "bsml/shared/BSML/Components/ModalView.hpp"
+#include "bsml/shared/BSML/ViewControllers/HotReloadViewController.hpp"
+#include "custom-types/shared/coroutine.hpp"
+#include "custom-types/shared/macros.hpp"
+#include "UnityEngine/MonoBehaviour.hpp"
+#include "bsml/shared/BSML/Components/CustomListTableData.hpp"
+
+
+namespace BetterSongSearch::UI::Modals {
+    enum class GenreCellStatus {
+        None,
+        Include,
+        Exclude
+    };  
+
+    struct GenreCellState {
+        std::string tag;
+        uint64_t mask;
+        GenreCellStatus status;
+        uint32_t songCount;
+    };
+}
+
+
+DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::Modals, GenrePicker, UnityEngine::MonoBehaviour, classof(HMUI::TableView::IDataSource*),
+    
+    DECLARE_OVERRIDE_METHOD_MATCH(HMUI::TableCell*, CellForIdx, &HMUI::TableView::IDataSource::CellForIdx, HMUI::TableView* tableView, int idx);
+    DECLARE_OVERRIDE_METHOD_MATCH(float, CellSize, &HMUI::TableView::IDataSource::CellSize);
+    DECLARE_OVERRIDE_METHOD_MATCH(int, NumberOfCells, &HMUI::TableView::IDataSource::NumberOfCells);
+
+    DECLARE_INSTANCE_METHOD(void, OnEnable);
+    DECLARE_CTOR(ctor);
+    DECLARE_INSTANCE_METHOD(void, OnDestroy);
+
+    DECLARE_INSTANCE_METHOD(void, PostParse);
+
+    DECLARE_INSTANCE_METHOD(void, OpenModal);
+    DECLARE_INSTANCE_METHOD(void, CloseModal);
+
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::CustomListTableData>, genresTableData);
+
+    DECLARE_INSTANCE_METHOD(void, ClearGenre);
+    DECLARE_INSTANCE_METHOD(void, SelectGenre);
+    DECLARE_INSTANCE_METHOD(void, RefreshGenreList);
+    
+    DECLARE_INSTANCE_FIELD(bool, initialized);
+    
+    // Modals
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ModalView>, genrePickerModal);
+
+    private:
+        std::vector<BetterSongSearch::UI::Modals::GenreCellState> genres;
+
+)
diff --git a/include/UI/Modals/GenrePickerCell.hpp b/include/UI/Modals/GenrePickerCell.hpp
new file mode 100644
index 0000000..1629a83
--- /dev/null
+++ b/include/UI/Modals/GenrePickerCell.hpp
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "UnityEngine/MonoBehaviour.hpp"
+#include "UnityEngine/UI/VerticalLayoutGroup.hpp"
+#include "HMUI/ViewController.hpp"
+#include "HMUI/TableCell.hpp"
+#include "HMUI/ImageView.hpp"
+#include "custom-types/shared/macros.hpp"
+#include "System/Object.hpp"
+#include "TMPro/TextMeshProUGUI.hpp"
+#include "bsml/shared/macros.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "bsml/shared/BSML/Components/CustomListTableData.hpp"
+#include "bsml/shared/BSML/Components/ClickableText.hpp"
+#include "HMUI/Touchable.hpp"
+#include "HMUI/TableView.hpp"
+#include "UnityEngine/UI/HorizontalOrVerticalLayoutGroup.hpp"
+#include "assets.hpp"
+#include "UI/Modals/GenrePicker.hpp"
+
+DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::Modals, GenrePickerCell, HMUI::TableCell,
+    DECLARE_OVERRIDE_METHOD_MATCH(void, SelectionDidChange, &HMUI::SelectableCell::SelectionDidChange, HMUI::SelectableCell::TransitionType transitionType);
+    DECLARE_OVERRIDE_METHOD_MATCH(void, HighlightDidChange, &HMUI::SelectableCell::HighlightDidChange, HMUI::SelectableCell::TransitionType transitionType);
+    DECLARE_OVERRIDE_METHOD_MATCH(void, WasPreparedForReuse, &HMUI::TableCell::WasPreparedForReuse);
+
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ClickableText>, includeButton);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ClickableText>, excludeButton);
+
+    DECLARE_INSTANCE_METHOD(void, IncludeGenre);
+    DECLARE_INSTANCE_METHOD(void, ExcludeGenre);
+
+    DECLARE_INSTANCE_METHOD(void, Refresh);
+
+public:
+    BetterSongSearch::UI::Modals::GenrePickerCell* PopulateWithGenre(BetterSongSearch::UI::Modals::GenreCellState* state);
+    static BetterSongSearch::UI::Modals::GenrePickerCell *GetCell(HMUI::TableView *tableView);
+
+private:
+    BetterSongSearch::UI::Modals::GenreCellState* genre;
+)
diff --git a/include/UI/Modals/Presets.hpp b/include/UI/Modals/Presets.hpp
new file mode 100644
index 0000000..6805461
--- /dev/null
+++ b/include/UI/Modals/Presets.hpp
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "bsml/shared/BSML.hpp"
+#include "bsml/shared/BSML/Components/CustomListTableData.hpp"
+#include "bsml/shared/BSML/Components/ModalView.hpp"
+#include "bsml/shared/BSML/Components/Settings/SliderSetting.hpp"
+#include "bsml/shared/BSML/Components/Settings/StringSetting.hpp"
+#include "bsml/shared/BSML/ViewControllers/HotReloadViewController.hpp"
+#include "bsml/shared/macros.hpp"
+#include "custom-types/shared/coroutine.hpp"
+#include "custom-types/shared/macros.hpp"
+#include "HMUI/ModalView.hpp"
+#include "HMUI/TableView.hpp"
+#include "HMUI/ViewController.hpp"
+#include "UnityEngine/MonoBehaviour.hpp"
+
+
+DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::Modals, Presets, UnityEngine::
+MonoBehaviour, classof(HMUI::TableView::IDataSource*),
+    DECLARE_INSTANCE_METHOD(void, OnEnable);
+    DECLARE_CTOR(ctor);
+
+    DECLARE_OVERRIDE_METHOD_MATCH(HMUI::TableCell*, CellForIdx, &HMUI::TableView::IDataSource::CellForIdx, HMUI::TableView* tableView, int idx);
+    DECLARE_OVERRIDE_METHOD_MATCH(float, CellSize
+, &HMUI::TableView::IDataSource::CellSize);
+    DECLARE_OVERRIDE_METHOD_MATCH(int, NumberOfCells, &HMUI::TableView::IDataSource::NumberOfCells);
+
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::CustomListTableData>, presetListTableData);
+
+    DECLARE_INSTANCE_METHOD(void, PostParse);
+
+    DECLARE_INSTANCE_METHOD(void, OpenModal);
+    DECLARE_INSTANCE_METHOD(void, CloseModal);
+
+    DECLARE_INSTANCE_METHOD(void, OpenSavePresetModal);
+    DECLARE_INSTANCE_METHOD(void, CloseSavePresetModal);
+
+    DECLARE_INSTANCE_METHOD(void, AddPreset);
+    DECLARE_INSTANCE_METHOD(void, LoadPreset);
+    DECLARE_INSTANCE_METHOD(void, DeletePreset);
+    DECLARE_INSTANCE_METHOD(void, PresetSelected, UnityW<HMUI::TableView> table, int id);
+    DECLARE_INSTANCE_METHOD(void, RefreshPresetsList);
+
+    DECLARE_INSTANCE_FIELD(bool, initialized);
+
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::StringSetting>, newPresetNameSetting);
+    // Modals
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ModalView>, presetsModal);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ModalView>, savePresetModal);
+
+    // Buttons
+    DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::Button>, loadButton);
+    DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::Button>, deleteButton);
+
+    public:
+        UnityW<HMUI::TableView> presetsTable() {if(presetListTableData) {
+            return presetListTableData->tableView;} else return nullptr;}
+
+        std::vector<std::string> presets;
+        std::string selectedPreset;
+)
diff --git a/include/UI/Modals/PresetsTable.hpp b/include/UI/Modals/PresetsTable.hpp
new file mode 100644
index 0000000..22a6f54
--- /dev/null
+++ b/include/UI/Modals/PresetsTable.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "UnityEngine/MonoBehaviour.hpp"
+#include "UnityEngine/UI/VerticalLayoutGroup.hpp"
+#include "HMUI/ViewController.hpp"
+#include "HMUI/TableCell.hpp"
+#include "HMUI/ImageView.hpp"
+#include "custom-types/shared/macros.hpp"
+#include "System/Object.hpp"
+#include "TMPro/TextMeshProUGUI.hpp"
+#include "bsml/shared/macros.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "bsml/shared/BSML/Components/CustomListTableData.hpp"
+#include "HMUI/Touchable.hpp"
+#include "HMUI/TableView.hpp"
+#include "UnityEngine/UI/HorizontalOrVerticalLayoutGroup.hpp"
+#include "assets.hpp"
+
+DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::Modals, PresetsTableCell, HMUI::TableCell,
+    DECLARE_OVERRIDE_METHOD_MATCH(void, SelectionDidChange, &HMUI::SelectableCell::SelectionDidChange, HMUI::SelectableCell::TransitionType transitionType);
+    DECLARE_OVERRIDE_METHOD_MATCH(void, HighlightDidChange, &HMUI::SelectableCell::HighlightDidChange, HMUI::SelectableCell::TransitionType transitionType);
+    DECLARE_OVERRIDE_METHOD_MATCH(void, WasPreparedForReuse, &HMUI::TableCell::WasPreparedForReuse);
+    DECLARE_INSTANCE_FIELD(TMPro::TextMeshProUGUI*, presetNameLabel);
+    DECLARE_INSTANCE_FIELD(HMUI::ImageView*, bgContainer);   
+
+public:
+    PresetsTableCell* PopulateWithPresetName(StringW presetName);
+    static PresetsTableCell *GetCell(HMUI::TableView *tableView);
+
+    private:
+        void RefreshBgState();
+)
diff --git a/include/UI/Modals/Settings.hpp b/include/UI/Modals/Settings.hpp
index 15fece4..128732a 100644
--- a/include/UI/Modals/Settings.hpp
+++ b/include/UI/Modals/Settings.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "main.hpp"
+
 #include "bsml/shared/macros.hpp"
 #include "bsml/shared/BSML.hpp"
 #include "HMUI/ModalView.hpp"
@@ -26,6 +26,5 @@ DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::Modals, Settings, UnityEngine::MonoB
 
     DECLARE_BSML_PROPERTY(StringW, preferredLeaderboard);
     DECLARE_INSTANCE_FIELD(BSML::ModalView*, settingsModal);
-    // DECLARE_INSTANCE_FIELD(BSML::ModalView*, chinaModal);
     BSML_OPTIONS_LIST_OBJECT(preferredLeaderboardOptions, "Scoresaber", "Beatleader");
 )
\ No newline at end of file
diff --git a/include/UI/Modals/UploadDetails.hpp b/include/UI/Modals/UploadDetails.hpp
index ee0de80..ced30ff 100644
--- a/include/UI/Modals/UploadDetails.hpp
+++ b/include/UI/Modals/UploadDetails.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "main.hpp"
+
 #include "bsml/shared/macros.hpp"
 #include "bsml/shared/BSML.hpp"
 #include "TMPro/TextMeshProUGUI.hpp"
@@ -22,6 +22,9 @@ DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::Modals, UploadDetails, UnityEngine::
     DECLARE_CTOR(ctor);
     
     DECLARE_INSTANCE_METHOD(void, CloseModal);
+    DECLARE_INSTANCE_METHOD(void, OpenBeatSaver);
+    DECLARE_INSTANCE_METHOD(void, CopyBSR);
+    DECLARE_INSTANCE_METHOD(void, OpenMapPreview);
 
 
     DECLARE_INSTANCE_FIELD(TMPro::TextMeshProUGUI*, selectedSongKey);
diff --git a/include/UI/ViewControllers/DownloadHistory.hpp b/include/UI/ViewControllers/DownloadHistory.hpp
index 21d2f78..d322a47 100644
--- a/include/UI/ViewControllers/DownloadHistory.hpp
+++ b/include/UI/ViewControllers/DownloadHistory.hpp
@@ -20,7 +20,6 @@
 #include "custom-types/shared/coroutine.hpp"
 #include "custom-types/shared/macros.hpp"
 
-#include "main.hpp"
 #include "Util/RatelimitCoroutine.hpp"
 
 #ifndef DECLARE_OVERRIDE_METHOD_MATCH
@@ -28,12 +27,8 @@
     DECLARE_OVERRIDE_METHOD(retval, method, il2cpp_utils::il2cpp_type_check::MetadataGetter<mptr>::get(), __VA_ARGS__)
 #endif
 
-
-#define GET_FIND_METHOD(mPtr) il2cpp_utils::il2cpp_type_check::MetadataGetter<mPtr>::get()
-
 inline static const int RETRY_COUNT = 3;
 
-
 class DownloadHistoryEntry {
 public:
     enum DownloadStatus {
@@ -111,7 +106,7 @@ class DownloadHistoryEntry {
 };
 
 #ifdef HotReload
-DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::ViewControllers, DownloadHistoryViewController, BSML::HotReloadViewController, classof(HMUI::TableView::IDataSource*),
+DECLARE_CLASS_CUSTOM_INTERFACES(BetterSongSearch::UI::ViewControllers, DownloadHistoryViewController, BSML::HotReloadViewController, std::vector<Il2CppClass*>({classof(HMUI::TableView::IDataSource*)}),
 #else
 DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::ViewControllers, DownloadHistoryViewController, HMUI::ViewController, classof(HMUI::TableView::IDataSource*),
 #endif
diff --git a/include/UI/ViewControllers/DownloadListTableData.hpp b/include/UI/ViewControllers/DownloadListTableData.hpp
index d4cb6e4..799b689 100644
--- a/include/UI/ViewControllers/DownloadListTableData.hpp
+++ b/include/UI/ViewControllers/DownloadListTableData.hpp
@@ -1,11 +1,8 @@
 #pragma once
 
-
 #include "UI/ViewControllers/DownloadHistoryCell.hpp"
 #include "HMUI/Touchable.hpp"
 #include "bsml/shared/BSML.hpp"
-
-#include "main.hpp"
 #include "assets.hpp"
 
 const StringW ReuseIdentifier = "REUSECustomDownloadListTableCell";
diff --git a/include/UI/ViewControllers/FilterView.hpp b/include/UI/ViewControllers/FilterView.hpp
index b2ebec5..3c37f0b 100644
--- a/include/UI/ViewControllers/FilterView.hpp
+++ b/include/UI/ViewControllers/FilterView.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "UnityEngine/UI/Button.hpp"
 #include "UnityEngine/UI/HorizontalLayoutGroup.hpp"
 #include "HMUI/ViewController.hpp"
 #include "bsml/shared/macros.hpp"
@@ -12,26 +13,43 @@
 #include "bsml/shared/BSML/Components/ClickableText.hpp"
 #include "custom-types/shared/coroutine.hpp"
 #include "custom-types/shared/macros.hpp"
+#include "UI/Modals/Presets.hpp"
+#include "UI/Modals/GenrePicker.hpp"
 
 #include "Util/RatelimitCoroutine.hpp"
 
-#define GET_FIND_METHOD(mPtr) il2cpp_utils::il2cpp_type_check::MetadataGetter<mPtr>::get()
-
 #ifdef HotReload
 DECLARE_CLASS_CUSTOM(BetterSongSearch::UI::ViewControllers, FilterViewController, BSML::HotReloadViewController,
 #else
 DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::ViewControllers, FilterViewController, HMUI::ViewController,
 #endif
 
-    DECLARE_SIMPLE_DTOR();
+    DECLARE_CTOR(ctor);
+    DECLARE_INSTANCE_METHOD(void, OnDestroy);
+
     DECLARE_OVERRIDE_METHOD_MATCH(void, DidActivate, &HMUI::ViewController::DidActivate, bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling);
+    
+    // Modals
+    DECLARE_INSTANCE_FIELD(UnityW<Modals::Presets>, presetsModal);
+    DECLARE_INSTANCE_FIELD(UnityW<Modals::GenrePicker>, genrePickerModal);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ModalView>, sponsorModal);
+
+
+    DECLARE_INSTANCE_METHOD(void, PostParse);
 
     // Modal related things
     DECLARE_INSTANCE_METHOD(void, OpenSponsorsModal);
     DECLARE_INSTANCE_METHOD(void, CloseSponsorModal);
     DECLARE_INSTANCE_METHOD(void, OpenSponsorsLink);
     DECLARE_INSTANCE_METHOD(void, TryToDownloadDataset);
-    
+    DECLARE_INSTANCE_METHOD(void, ShowGenrePicker);
+
+    // @brief Update the global state from the filter settings withouth updating the UI
+    DECLARE_INSTANCE_METHOD(void, UpdateLocalState);
+
+    DECLARE_INSTANCE_METHOD(void, ForceRefreshUI);
+
+    DECLARE_INSTANCE_METHOD(void, ForceFormatValues);
 
     // Header buttons
     DECLARE_INSTANCE_METHOD(void, ClearFilters);
@@ -45,6 +63,7 @@ DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::ViewControllers, FilterViewControlle
     BSML_OPTIONS_LIST_OBJECT(characteristics, "Any", "Custom", "Standard", "One Saber", "No Arrows", "90 Degrees", "360 Degrees", "Lightshow", "Lawless");
     BSML_OPTIONS_LIST_OBJECT(difficulties, "Any", "Easy", "Normal", "Hard", "Expert", "Expert+");
     BSML_OPTIONS_LIST_OBJECT(modOptions, "Any", "Noodle Extensions", "Mapping Extensions", "Chroma", "Cinema", "None");
+    BSML_OPTIONS_LIST_OBJECT(mapStyles,  "Any", "accuracy", "balanced", "challenge", "dance", "fitness", "speed", "tech");
 
     // Values for dropdowns
     DECLARE_INSTANCE_FIELD(StringW, existingSongs);
@@ -53,6 +72,7 @@ DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::ViewControllers, FilterViewControlle
     DECLARE_INSTANCE_FIELD(StringW, characteristic);
     DECLARE_INSTANCE_FIELD(StringW, difficulty);
     DECLARE_INSTANCE_FIELD(StringW, mods);
+    DECLARE_INSTANCE_FIELD(StringW, mapStyleString);
 
     // Values for sliders
     DECLARE_INSTANCE_FIELD(float, minimumSongLength);
@@ -64,45 +84,61 @@ DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::ViewControllers, FilterViewControlle
     DECLARE_INSTANCE_FIELD(float, minimumStars);
     DECLARE_INSTANCE_FIELD(float, maximumStars);
     DECLARE_INSTANCE_FIELD(float, minimumRating);
+
+    // Values for toggles
+    DECLARE_INSTANCE_FIELD(bool, onlyCuratedMaps);
+    DECLARE_INSTANCE_FIELD(bool, onlyVerifiedMappers);
+    DECLARE_INSTANCE_FIELD(bool, onlyV3Maps);
+
     // These are float because there is some bug in 
     DECLARE_INSTANCE_FIELD(float, minimumVotes);
     DECLARE_INSTANCE_FIELD(float, hideOlderThan);
 
     DECLARE_INSTANCE_METHOD(void, UpdateFilterSettings);
 
+    // Used to refresh the filter text
+    DECLARE_INSTANCE_METHOD(void, UpdateGenreFilterText);
+
     // BG layout stuff
     DECLARE_INSTANCE_FIELD(UnityEngine::UI::HorizontalLayoutGroup*, filterbarContainer);
 
     // Sliders that need to be formatted
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, hideOlderThanSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, minimumRatingSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, minStarsSetting);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, maxStarsSetting);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, minimumNjsSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, maximumNjsSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, minimumNpsSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, maximumNpsSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, minimumSongLengthSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, maximumSongLengthSlider);
-    DECLARE_INSTANCE_FIELD(BSML::SliderSetting*, minimumVotesSlider);
-    DECLARE_INSTANCE_FIELD(BSML::StringSetting*, uploadersStringControl);    
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, hideOlderThanSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, minimumRatingSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, minStarsSetting);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, maxStarsSetting);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, minimumNjsSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, maximumNjsSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, minimumNpsSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, maximumNpsSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, minimumSongLengthSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, maximumSongLengthSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::SliderSetting>, minimumVotesSlider);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::StringSetting>, uploadersStringControl);
 
     // Values for string fields
     DECLARE_INSTANCE_FIELD(StringW, uploadersString);
 
     // Dropdowns and settings
-    DECLARE_INSTANCE_FIELD(BSML::ListSetting*, existingSongsSetting);
-    DECLARE_INSTANCE_FIELD(BSML::ListSetting*, existingScoreSetting);
-    DECLARE_INSTANCE_FIELD(BSML::DropdownListSetting*, rankedStateSetting);
-    DECLARE_INSTANCE_FIELD(BSML::DropdownListSetting*, characteristicDropdown);
-    DECLARE_INSTANCE_FIELD(BSML::DropdownListSetting*, difficultyDropdown);   
-    DECLARE_INSTANCE_FIELD(BSML::DropdownListSetting*, modsRequirementDropdown);  
-
-    DECLARE_INSTANCE_FIELD(BSML::ClickableText*, datasetInfoLabel);
-
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ListSetting>, existingSongsSetting);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ListSetting>, existingScoreSetting);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::DropdownListSetting>, rankedStateSetting);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::DropdownListSetting>, characteristicDropdown);
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::DropdownListSetting>, difficultyDropdown);   
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::DropdownListSetting>, modsRequirementDropdown);  
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::DropdownListSetting>, mapStyleDropdown);
+
+    DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::Button>, genrePickButton);
+    
+    DECLARE_INSTANCE_FIELD(UnityW<BSML::ClickableText>, datasetInfoLabel);
+    DECLARE_INSTANCE_FIELD(UnityW<TMPro::TextMeshProUGUI>, versionLabel);
+    
     // DECLARE_INSTANCE_METHOD(StringW, minRatingSliderFormatFunction, float value);
     // DECLARE_INSTANCE_METHOD(StringW, minUploadDateSliderFormatFunciton, float monthsSinceFirstUpload);
     public:
         custom_types::Helpers::Coroutine _UpdateFilterSettings();
+        void OnLoaded();
+        void OnFailed(std::string error);
+        void OnSearchComplete();
         BetterSongSearch::Util::RatelimitCoroutine* limitedUpdateFilterSettings = nullptr;
 )
\ No newline at end of file
diff --git a/include/UI/ViewControllers/SongList.hpp b/include/UI/ViewControllers/SongList.hpp
index 1abd563..3d9f254 100644
--- a/include/UI/ViewControllers/SongList.hpp
+++ b/include/UI/ViewControllers/SongList.hpp
@@ -1,181 +1,103 @@
 #pragma once
-#include "UI/ViewControllers/SongListCellTableData.hpp"
-#include "HMUI/CurvedTextMeshPro.hpp"
+#include <fmt/chrono.h>
 
-#include "HMUI/TableView.hpp"
-#include "HMUI/ViewController.hpp"
-#include "HMUI/TableCell.hpp"
-#include "HMUI/ImageView.hpp"
-#include "HMUI/TextPageScrollView.hpp"
-#include "System/Object.hpp"
-#include "TMPro/TextMeshProUGUI.hpp"
-#include "TMPro/TextAlignmentOptions.hpp"
-#include "GlobalNamespace/SoloFreePlayFlowCoordinator.hpp"
-#include "GlobalNamespace/MultiplayerLevelSelectionFlowCoordinator.hpp"
-#include "GlobalNamespace/LevelSelectionFlowCoordinator.hpp"
-#include "bsml/shared/macros.hpp"
 #include "bsml/shared/BSML.hpp"
-#include "bsml/shared/BSML/ViewControllers/HotReloadViewController.hpp"
-#include "bsml/shared/BSML/Components/Settings/DropdownListSetting.hpp"
 #include "bsml/shared/BSML/Components/CustomListTableData.hpp"
 #include "bsml/shared/BSML/Components/ModalView.hpp"
-#include "songcore/shared/SongCore.hpp"
+#include "bsml/shared/BSML/Components/Settings/DropdownListSetting.hpp"
+#include "bsml/shared/BSML/ViewControllers/HotReloadViewController.hpp"
+#include "bsml/shared/macros.hpp"
 #include "custom-types/shared/coroutine.hpp"
 #include "custom-types/shared/macros.hpp"
+#include "FilterOptions.hpp"
+#include "GlobalNamespace/LevelSelectionFlowCoordinator.hpp"
+#include "GlobalNamespace/MultiplayerLevelSelectionFlowCoordinator.hpp"
+#include "GlobalNamespace/SoloFreePlayFlowCoordinator.hpp"
+#include "HMUI/CurvedTextMeshPro.hpp"
+#include "HMUI/ImageView.hpp"
+#include "HMUI/TableCell.hpp"
+#include "HMUI/TableView.hpp"
+#include "HMUI/TextPageScrollView.hpp"
+#include "HMUI/ViewController.hpp"
+#include "song-details/shared/Data/MapCharacteristic.hpp"
 #include "song-details/shared/Data/Song.hpp"
 #include "song-details/shared/Data/SongDifficulty.hpp"
-#include "song-details/shared/Data/MapCharacteristic.hpp"
-#include "UnityEngine/MonoBehaviour.hpp"
-#include "UnityEngine/UI/HorizontalOrVerticalLayoutGroup.hpp"
-#include "UnityEngine/UI/VerticalLayoutGroup.hpp"
+#include "song-details/shared/SongDetails.hpp"
+#include "songcore/shared/SongCore.hpp"
+#include "songcore/shared/SongLoader/CustomBeatmapLevel.hpp"
+#include "System/Object.hpp"
 #include "System/Threading/CancellationToken.hpp"
 #include "System/Threading/CancellationTokenSource.hpp"
-#include "main.hpp"
-#include "FilterOptions.hpp"
-#include "Util/RatelimitCoroutine.hpp"
+#include "TMPro/TextAlignmentOptions.hpp"
+#include "TMPro/TextMeshProUGUI.hpp"
 #include "UI/Modals/MultiDL.hpp"
 #include "UI/Modals/Settings.hpp"
 #include "UI/Modals/UploadDetails.hpp"
-#include "song-details/shared/SongDetails.hpp"
-#include "song-details/shared/Data/Song.hpp"
-#include <fmt/chrono.h>
+#include "UI/ViewControllers/SongListCellTableData.hpp"
+#include "UnityEngine/MonoBehaviour.hpp"
+#include "UnityEngine/UI/HorizontalOrVerticalLayoutGroup.hpp"
+#include "UnityEngine/UI/VerticalLayoutGroup.hpp"
+#include "Util/RatelimitCoroutine.hpp"
 
 #ifndef DECLARE_OVERRIDE_METHOD_MATCH
 #define DECLARE_OVERRIDE_METHOD_MATCH(retval, method, mptr, ...) \
     DECLARE_OVERRIDE_METHOD(retval, method, il2cpp_utils::il2cpp_type_check::MetadataGetter<mptr>::get(), __VA_ARGS__)
 #endif
 
-
-#define GET_FIND_METHOD(mPtr) il2cpp_utils::il2cpp_type_check::MetadataGetter<mPtr>::get()
-
 namespace BetterSongSearch::UI {
     inline bool fromBSS = false;
     inline bool openToCustom = false;
-    bool MeetsFilter(const SongDetailsCache::Song* song);
-    bool DifficultyCheck(const SongDetailsCache::SongDifficulty* diff, const SongDetailsCache::Song* song);
-
-    // Global variables
-    struct DataHolder {
-        // Song details ref
-        inline static SongDetailsCache::SongDetails* songDetails;
-        // Filtered songs
-        inline static std::vector<const SongDetailsCache::Song*> filteredSongList;
-        // Searched songs
-        inline static std::vector<const SongDetailsCache::Song*> searchedSongList;
-        // Sorted songs (actually displayed)
-        inline static std::vector<const SongDetailsCache::Song*> sortedSongList;
-
-        // State variables to be globally accessible
-        inline static SortMode currentSort = SortMode::Newest;
-        inline static std::string currentSearch = "";
-
-        inline static std::unordered_set<std::string> songsWithScores;
-
-        inline static FilterOptions filterOptions;
-        inline static FilterOptionsCache filterOptionsCache;
-        /// @brief Player data model to get the scores
-        inline static UnityW<GlobalNamespace::PlayerDataModel> playerDataModel = nullptr;
-
-        // Preferred Leaderboard
-        inline static PreferredLeaderBoard preferredLeaderboard = PreferredLeaderBoard::ScoreSaber;
-
-        /// @brief Song data is loaded
-        inline static bool loaded = false;
-        /// @brief Song data failed to load
-        inline static bool failed = false;
-        // Song data is loading 
-        inline static bool loading = false;
-        /// @brief Flag to say that the song list needs a refresh when the user opens the BSS because the data got updated
-        inline static bool needsRefresh = false;
-        // Song list is invalid (means that we should not touch anything in the song list rn)
-        inline static bool invalid = false;
-
-    };
-
-#define PROP_GET(jsonName, varName)                                \
-    static auto jsonNameHash_##varName = stringViewHash(jsonName); \
-    if (nameHash == (jsonNameHash_##varName))                      \
-        return &varName;
-
-
-    constexpr std::string_view ShortMapDiffNames(std::string_view input) {
-        // order variables from most likely to least likely to at least improve branch checks
-        // optimization switch idea stolen from Red's SDC wrapper. Good job red 👏
-        switch (input.front()) {
-            case 'E':
-                // ExpertPlus
-                if (input.back() == 's') {
-                    return "Ex+";
-                }
-                // Easy
-                if (input.size() == 4) {
-                    return "E";
-                }
-                // Expert
-                return "Ex";
-            case 'N':
-                return "N";
-            case 'H':
-                return "H";
-            default:
-                return "UNKNOWN";
-        }
-    }
-
-#undef PROP_GET
-
-}
-
-using SortFunction = std::function< float (SongDetailsCache::Song const*)>;
-extern std::unordered_map<SortMode, SortFunction> sortFunctionMap;
+}  // namespace BetterSongSearch::UI
 
 #ifdef HotReload
-DECLARE_CLASS_CUSTOM_INTERFACES(BetterSongSearch::UI::ViewControllers, SongListController, BSML::HotReloadViewController, classof(HMUI::TableView::IDataSource*),
+DECLARE_CLASS_CUSTOM_INTERFACES(
+    BetterSongSearch::UI::ViewControllers,
+    SongListController,
+    BSML::HotReloadViewController,
+    std::vector<Il2CppClass*>({classof(HMUI::TableView::IDataSource*)}),
 #else
 DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::ViewControllers, SongListController, HMUI::ViewController, classof(HMUI::TableView::IDataSource*),
 #endif
 
     DECLARE_CTOR(ctor);
-    DECLARE_DTOR(dtor);
-    DECLARE_OVERRIDE_METHOD_MATCH(void, DidActivate, &HMUI::ViewController::DidActivate, bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling);
+    DECLARE_INSTANCE_METHOD(void, OnDestroy);
+    DECLARE_OVERRIDE_METHOD_MATCH(
+        void, DidActivate, &HMUI::ViewController::DidActivate, bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling
+    );
     DECLARE_INSTANCE_FIELD(UnityW<BSML::CustomListTableData>, songList);
 
     DECLARE_INSTANCE_METHOD(void, SelectSong, UnityW<HMUI::TableView> table, int id);
     DECLARE_INSTANCE_FIELD(UnityEngine::UI::VerticalLayoutGroup*, scrollBarContainer);
     DECLARE_INSTANCE_FIELD(float, cellSize);
 
-
     DECLARE_OVERRIDE_METHOD_MATCH(HMUI::TableCell*, CellForIdx, &HMUI::TableView::IDataSource::CellForIdx, HMUI::TableView* tableView, int idx);
     DECLARE_OVERRIDE_METHOD_MATCH(float, CellSize, &HMUI::TableView::IDataSource::CellSize);
     DECLARE_OVERRIDE_METHOD_MATCH(int, NumberOfCells, &HMUI::TableView::IDataSource::NumberOfCells);
-    
+
     DECLARE_INSTANCE_METHOD(void, SelectRandom);
     DECLARE_INSTANCE_METHOD(void, ShowMoreModal);
     DECLARE_INSTANCE_METHOD(void, HideMoreModal);
     DECLARE_INSTANCE_METHOD(void, UpdateDataAndFilters);
 
-
     DECLARE_INSTANCE_METHOD(void, ShowBatchDownload);
     DECLARE_INSTANCE_METHOD(void, ShowPlaylistCreation);
     DECLARE_INSTANCE_METHOD(void, ShowSettings);
     DECLARE_INSTANCE_METHOD(void, ShowCloseConfirmation);
     DECLARE_INSTANCE_METHOD(void, ForcedUIClose);
     DECLARE_INSTANCE_METHOD(void, ForcedUICloseCancel);
-    
-    
 
     // Play/DL
     DECLARE_INSTANCE_METHOD(void, Download);
     DECLARE_INSTANCE_METHOD(void, PostParse);
     DECLARE_INSTANCE_METHOD(void, Play);
-    
+
     DECLARE_INSTANCE_METHOD(void, ShowSongDetails);
     DECLARE_INSTANCE_METHOD(void, FilterByUploader);
     DECLARE_INSTANCE_METHOD(void, UpdateSearchedSongsList);
     DECLARE_INSTANCE_METHOD(void, _UpdateSearchedSongsList);
 
     DECLARE_INSTANCE_FIELD(bool, IsSearching);
-    
+
     DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::HorizontalOrVerticalLayoutGroup>, searchBoxContainer);
     DECLARE_INSTANCE_FIELD(UnityW<HMUI::CurvedTextMeshPro>, songSearchPlaceholder);
     DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::HorizontalOrVerticalLayoutGroup>, detailActions);
@@ -191,7 +113,7 @@ DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::ViewControllers, SongList
     DECLARE_INSTANCE_FIELD(UnityW<TMPro::TextMeshProUGUI>, selectedSongAuthor);
     DECLARE_INSTANCE_FIELD(UnityW<TMPro::TextMeshProUGUI>, selectedSongName);
 
-    DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::GameObject >, searchBox);
+    DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::GameObject>, searchBox);
     DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::Sprite>, defaultImage);
     DECLARE_INSTANCE_FIELD(UnityW<HMUI::ImageView>, coverImage);
     DECLARE_INSTANCE_FIELD(UnityW<HMUI::ImageView>, coverLoading);
@@ -200,7 +122,7 @@ DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::ViewControllers, SongList
     DECLARE_INSTANCE_FIELD(UnityW<Modals::MultiDL>, multiDlModal);
     DECLARE_INSTANCE_FIELD(UnityW<Modals::Settings>, settingsModal);
     DECLARE_INSTANCE_FIELD(UnityW<Modals::UploadDetails>, uploadDetailsModal);
-    
+
     DECLARE_INSTANCE_FIELD(UnityW<TMPro::TextMeshProUGUI>, selectedSongDiffInfo);
 
     DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::Button>, downloadButton);
@@ -214,39 +136,29 @@ DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::ViewControllers, SongList
     DECLARE_INSTANCE_FIELD(UnityW<GlobalNamespace::SoloFreePlayFlowCoordinator>, soloFreePlayFlowCoordinator);
     DECLARE_INSTANCE_FIELD(UnityW<GlobalNamespace::MultiplayerLevelSelectionFlowCoordinator>, multiplayerLevelSelectionFlowCoordinator);
 
-
     DECLARE_INSTANCE_FIELD(System::Threading::CancellationTokenSource*, songAssetLoadCanceller);
 
-public:
-    HMUI::TableView* songListTable() {
-        if(songList) {return songList->tableView;} else return nullptr;
+    public : HMUI::TableView *
+    songListTable() {
+        if (songList) {
+            return songList->tableView;
+        } else return nullptr;
     }
 
     void SelectSongByHash(std::string hash);
     void SetSelectedSong(const SongDetailsCache::Song* song);
 
-
     BetterSongSearch::Util::RatelimitCoroutine* limitedUpdateSearchedSongsList = nullptr;
 
-    void SortAndFilterSongs(SortMode sort, std::string_view search, bool resetTable);
+    void SortAndFilterSongs(FilterTypes::SortMode sort, std::string_view search, bool resetTable);
     void ResetTable();
     const SongDetailsCache::Song* currentSong = nullptr;
     void UpdateDetails();
     void SetIsDownloaded(bool isDownloaded, bool downloadable = true);
 
-    // Temp values
-    std::string search = "";
-    SortMode sort = (SortMode) 0;
-    // Prev values
-    std::string prevSearch = "";
-    SortMode prevSort = (SortMode) 0;
-    
-    bool filterChanged = true;
-
     void UpdateSearch();
     custom_types::Helpers::Coroutine UpdateDataAndFiltersCoro();
 
-
     void PlaySong(const SongDetailsCache::Song* song = nullptr);
     void DownloadSongList();
     void RetryDownloadSongList();
@@ -254,7 +166,9 @@ DECLARE_CLASS_CODEGEN_INTERFACES(BetterSongSearch::UI::ViewControllers, SongList
     void EnterSolo(GlobalNamespace::BeatmapLevel* level);
 
     // Event receivers
+    void SearchDone();
     void SongDataDone();
-    void SongDataError();
+    void SongDataError(std::string message);
+    void PlayerDataLoaded();
+    void OnSongsLoaded(std::span<SongCore::SongLoader::CustomBeatmapLevel* const> songs);
 )
-
diff --git a/include/UI/ViewControllers/SongListCell.hpp b/include/UI/ViewControllers/SongListCell.hpp
index c198f0b..6425bb1 100644
--- a/include/UI/ViewControllers/SongListCell.hpp
+++ b/include/UI/ViewControllers/SongListCell.hpp
@@ -16,8 +16,8 @@
 #include "bsml/shared/macros.hpp"
 #include "bsml/shared/BSML.hpp"
 #include "bsml/shared/BSML/Components/CustomListTableData.hpp"
+#include "songcore/shared/SongLoader/CustomBeatmapLevel.hpp"
 
-#define GET_FIND_METHOD(mPtr) il2cpp_utils::il2cpp_type_check::MetadataGetter<mPtr>::get()
 
 DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::ViewControllers, CustomSongListTableCell, HMUI::TableCell,
     DECLARE_OVERRIDE_METHOD_MATCH(void, SelectionDidChange, &HMUI::SelectableCell::SelectionDidChange, HMUI::SelectableCell::TransitionType transitionType);
@@ -31,6 +31,8 @@ DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::ViewControllers, CustomSongListTable
     DECLARE_INSTANCE_FIELD(UnityEngine::UI::HorizontalOrVerticalLayoutGroup*, diffsContainer);
     DECLARE_INSTANCE_FIELD(HMUI::ImageView *, bgContainer);
 
+    DECLARE_CTOR(ctor);
+    DECLARE_INSTANCE_METHOD(void, OnDestroy);
 
 public:
     CustomSongListTableCell* PopulateWithSongData(const SongDetailsCache::Song* entry);
@@ -39,4 +41,5 @@ DECLARE_CLASS_CODEGEN(BetterSongSearch::UI::ViewControllers, CustomSongListTable
     
     void SetFontSizes();
     void RefreshBgState();
+    void OnSongsLoaded(std::span<SongCore::SongLoader::CustomBeatmapLevel* const> songs);
 )
\ No newline at end of file
diff --git a/include/UI/ViewControllers/SongListCellTableData.hpp b/include/UI/ViewControllers/SongListCellTableData.hpp
index 9e9c9d4..04c9e0d 100644
--- a/include/UI/ViewControllers/SongListCellTableData.hpp
+++ b/include/UI/ViewControllers/SongListCellTableData.hpp
@@ -7,8 +7,6 @@
 #include "bsml/shared/BSML.hpp"
 #include "TMPro/TextMeshProUGUI.hpp"
 #include "UnityEngine/UI/HorizontalOrVerticalLayoutGroup.hpp"
-
-#include "main.hpp"
 #include "assets.hpp"
 
 const StringW CustomSongListTableCellReuseIdentifier = "REUSECustomSongListTableCell";
diff --git a/include/Util/BSMLStuff.hpp b/include/Util/BSMLStuff.hpp
index 1baec53..9cec103 100644
--- a/include/Util/BSMLStuff.hpp
+++ b/include/Util/BSMLStuff.hpp
@@ -1,26 +1,23 @@
 #pragma once
 
-#include "System/Action.hpp"
-#include "System/Collections/IEnumerator.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "bsml/shared/BSML/Components/Settings/SliderSetting.hpp"
+#include "bsml/shared/BSML/Components/Settings/StringSetting.hpp"
+#include "bsml/shared/macros.hpp"
 #include "custom-types/shared/coroutine.hpp"
 #include "custom-types/shared/macros.hpp"
-#include "UnityEngine/WaitForSeconds.hpp"
+#include "HMUI/VerticalScrollIndicator.hpp"
+#include "System/Action.hpp"
+#include "System/Collections/IEnumerator.hpp"
 #include "UnityEngine/Coroutine.hpp"
-#include "UnityEngine/MonoBehaviour.hpp"
 #include "UnityEngine/GameObject.hpp"
-#include "UnityEngine/WaitForEndOfFrame.hpp"
-#include "HMUI/VerticalScrollIndicator.hpp"
-#include "bsml/shared/macros.hpp"
-#include "bsml/shared/BSML.hpp"
-#include "bsml/shared/BSML/Components/Settings/SliderSetting.hpp"
-#include "bsml/shared/BSML/Components/Settings/StringSetting.hpp"
-using namespace UnityEngine;
+#include "UnityEngine/MonoBehaviour.hpp"
 
 namespace BetterSongSearch::UI::Util::BSMLStuff {
-    custom_types::Helpers::Coroutine MergeSliders(GameObject* container, bool constrictValuesMinMax = true);
+    custom_types::Helpers::Coroutine MergeSliders(UnityEngine::GameObject* container, bool constrictValuesMinMax = true);
 
     void SetStringSettingValue(BSML::StringSetting* element, std::string value);
     void SetSliderSettingValue(BSML::SliderSetting* element, float value);
     void FormatSliderSettingValue(BSML::SliderSetting* element);
     void FormatStringSettingValue(BSML::StringSetting* element);
-}
+}  // namespace BetterSongSearch::UI::Util::BSMLStuff
diff --git a/include/Util/CurrentTimeMs.hpp b/include/Util/CurrentTimeMs.hpp
index a5a9d7e..011577a 100644
--- a/include/Util/CurrentTimeMs.hpp
+++ b/include/Util/CurrentTimeMs.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <chrono>
+
 namespace BetterSongSearch::Util {
     long long CurrentTimeMs();
-}
\ No newline at end of file
+}
diff --git a/include/Util/Debug.hpp b/include/Util/Debug.hpp
index bfb7800..770b402 100644
--- a/include/Util/Debug.hpp
+++ b/include/Util/Debug.hpp
@@ -1,32 +1,28 @@
 #pragma once
 
 #include <string>
-#include "main.hpp"
-#include "song-details/shared/Data/Song.hpp"
+
 #include "song-details/shared/Data/MapCharacteristic.hpp"
 #include "song-details/shared/Data/MapDifficulty.hpp"
+#include "song-details/shared/Data/Song.hpp"
 
-using namespace std;
-
-
-namespace BetterSongSearch::Util
-{
-    string SortToString(int sortMode);
+namespace BetterSongSearch::Util {
+    std::string SortToString(int sortMode);
 
-    string RequirementTypeToString(int requirementType);
+    std::string RequirementTypeToString(int requirementType);
 
-    string CharFilterTypeToString(int charFilterType);
+    std::string CharFilterTypeToString(int charFilterType);
 
-    string DifficultyFilterTypeToString(int diffFilterType);
+    std::string DifficultyFilterTypeToString(int diffFilterType);
 
-    string RankedFilterTypeToString(int rankedFilterType);
-    string LocalScoreFilterTypeToString(int localScoreFilterType);
+    std::string RankedFilterTypeToString(int rankedFilterType);
+    std::string LocalScoreFilterTypeToString(int localScoreFilterType);
 
-    string DownloadFilterTypeToString(int downloadFilterType);
+    std::string DownloadFilterTypeToString(int downloadFilterType);
 
     // Logs song info for checking sort and options
-    void LogSongInfo(const SongDetailsCache::Song* song);
+    void LogSongInfo(SongDetailsCache::Song const* song);
 
     // Prints to the provided buffer a nice number of bytes (KB, MB, GB, etc)
-    string pretty_bytes(int64_t bytes);
-}
+    std::string pretty_bytes(int64_t bytes);
+}  // namespace BetterSongSearch::Util
diff --git a/include/Util/Random.hpp b/include/Util/Random.hpp
index 9c5d342..c655d3b 100644
--- a/include/Util/Random.hpp
+++ b/include/Util/Random.hpp
@@ -1,9 +1,7 @@
 #pragma once
 
-#include <random>
-
 namespace BetterSongSearch::Util {
-    // Generate random number 
-    // Stolen from https://stackoverflow.com/questions/7560114/random-number-c-in-some-range
+
+    // Generate random number
     int random(int min, int max);
-}
\ No newline at end of file
+}  // namespace BetterSongSearch::Util
diff --git a/include/Util/RatelimitCoroutine.hpp b/include/Util/RatelimitCoroutine.hpp
index 5982030..dd77ebd 100644
--- a/include/Util/RatelimitCoroutine.hpp
+++ b/include/Util/RatelimitCoroutine.hpp
@@ -3,7 +3,6 @@
 #include "custom-types/shared/coroutine.hpp"
 #include "custom-types/shared/macros.hpp"
 #include "UnityEngine/WaitForSeconds.hpp"
-#include "main.hpp"
 
 namespace BetterSongSearch::Util {
 	class RatelimitCoroutine {
diff --git a/include/Util/SongUtil.hpp b/include/Util/SongUtil.hpp
index ea944a1..4ea119a 100644
--- a/include/Util/SongUtil.hpp
+++ b/include/Util/SongUtil.hpp
@@ -14,14 +14,53 @@
 
 
 namespace BetterSongSearch::Util {
-    UnityEngine::Sprite* getLocalCoverSync(SongCore::SongLoader::CustomBeatmapLevel* level);
+    UnityW<UnityEngine::Sprite> getLocalCoverSync(SongCore::SongLoader::CustomBeatmapLevel* level);
 
 
-    UnityEngine::Sprite* getLocalCoverSync(StringW songHash);
+    UnityW<UnityEngine::Sprite> getLocalCoverSync(StringW songHash);
 
     SongDetailsCache::RankedStates GetTargetedRankLeaderboardService(const SongDetailsCache::SongDifficulty* diff);
 
     float getStars(const SongDetailsCache::SongDifficulty* diff, SongDetailsCache::RankedStates state);
 
     float getStars(const SongDetailsCache::SongDifficulty* diff);
+
+
+    #define PROP_GET(jsonName, varName)                                \
+    static auto jsonNameHash_##varName = stringViewHash(jsonName); \
+    if (nameHash == (jsonNameHash_##varName))                      \
+        return &varName;
+
+
+    constexpr std::string_view ShortMapDiffNames(std::string_view input) {
+        // order variables from most likely to least likely to at least improve branch checks
+        // optimization switch idea stolen from Red's SDC wrapper. Good job red 👏
+        switch (input.front()) {
+            case 'E':
+                // ExpertPlus
+                if (input.back() == 's') {
+                    return "Ex+";
+                }
+                // Easy
+                if (input.size() == 4) {
+                    return "E";
+                }
+                // Expert
+                return "Ex";
+            case 'N':
+                return "N";
+            case 'H':
+                return "H";
+            default:
+                return "UNKNOWN";
+        }
+    }
+
+        #undef PROP_GET
+
+    bool MeetsFilter(const SongDetailsCache::Song* song);
+    bool DifficultyCheck(const SongDetailsCache::SongDifficulty* diff, const SongDetailsCache::Song* song);
+
+    using SortFunction = std::function< float (SongDetailsCache::Song const*)>;
+    extern std::unordered_map<FilterTypes::SortMode, SortFunction> sortFunctionMap;
 }
diff --git a/include/Util/TextUtil.hpp b/include/Util/TextUtil.hpp
index 7f26a21..f0d628b 100644
--- a/include/Util/TextUtil.hpp
+++ b/include/Util/TextUtil.hpp
@@ -8,6 +8,9 @@ namespace BetterSongSearch::Util {
     // this hurts
     std::vector<std::string> split(std::string_view buffer, const std::string_view delimeter = " ");
 
+    // @brief Joins a vector of strings into a single string, separated by a delimeter
+    std::string join(std::vector<std::string> strings, const std::string_view delimeter = " ");
+
     /**
      * Removes special characters from a string
     */
diff --git a/include/assets.hpp b/include/assets.hpp
index 4b0c307..d0a277c 100644
--- a/include/assets.hpp
+++ b/include/assets.hpp
@@ -6,8 +6,11 @@ DECLARE_FILE(_binary_DownloadHistory_bsml, Assets, DownloadHistory_bsml);
 DECLARE_FILE(_binary_DownloadHistoryCell_bsml, Assets, DownloadHistoryCell_bsml);
 DECLARE_FILE(_binary_DownloadListCell_bsml, Assets, DownloadListCell_bsml);
 DECLARE_FILE(_binary_FilterView_bsml, Assets, FilterView_bsml);
+DECLARE_FILE(_binary_GenrePicker_bsml, Assets, GenrePicker_bsml);
+DECLARE_FILE(_binary_GenrePickerCell_bsml, Assets, GenrePickerCell_bsml);
 DECLARE_FILE(_binary_MultiDl_bsml, Assets, MultiDl_bsml);
 DECLARE_FILE(_binary_Presets_bsml, Assets, Presets_bsml);
+DECLARE_FILE(_binary_PresetsListCell_bsml, Assets, PresetsListCell_bsml);
 DECLARE_FILE(_binary_Settings_bsml, Assets, Settings_bsml);
 DECLARE_FILE(_binary_SongList_bsml, Assets, SongList_bsml);
 DECLARE_FILE(_binary_SongListCell_bsml, Assets, SongListCell_bsml);
diff --git a/include/internal_macros.hpp b/include/internal_macros.hpp
deleted file mode 100644
index ccdf7ba..0000000
--- a/include/internal_macros.hpp
+++ /dev/null
@@ -1 +0,0 @@
-// FIXME: Dummy file cause Red included it for some reason, to be removed in the next release
\ No newline at end of file
diff --git a/include/main.hpp b/include/main.hpp
index 9143659..9837af6 100644
--- a/include/main.hpp
+++ b/include/main.hpp
@@ -9,4 +9,6 @@
 #include "beatsaber-hook/shared/utils/hooking.hpp"
 #include "beatsaber-hook/shared/config/config-utils.hpp"
 #include "beatsaber-hook/shared/utils/il2cpp-functions.hpp"
-#include "UnityEngine/GameObject.hpp"
\ No newline at end of file
+#include "UnityEngine/GameObject.hpp"
+
+static inline modloader::ModInfo modInfo = {MOD_ID, VERSION, GIT_COMMIT}; // Stores the ID and version of our mod, and is sent to the modloader upon startup
diff --git a/include/uri.hh b/include/uri.hh
index 2de6753..a7d4cd3 100644
--- a/include/uri.hh
+++ b/include/uri.hh
@@ -4,654 +4,504 @@
 #pragma once
 #include <cctype>
 #include <map>
-#include <string>
 #include <stdexcept>
+#include <string>
 #include <utility>
 
-class uri
-{
-  /* URIs are broadly divided into two categories: hierarchical and
-   * non-hierarchical. Both hierarchical URIs and non-hierarchical URIs have a
-   * few elements in common; all URIs have a scheme of one or more alphanumeric
-   * characters followed by a colon, and they all may optionally have a query
-   * component preceded by a question mark, and a fragment component preceded by
-   * an octothorpe (hash mark: '#'). The query consists of stanzas separated by
-   * either ampersands ('&') or semicolons (';') (but only one or the other),
-   * and each stanza consists of a key and an optional value; if the value
-   * exists, the key and value must be divided by an equals sign.
-   *
-   * The following is an example from Wikipedia of a hierarchical URI:
-   * scheme:[//[user:password@]domain[:port]][/]path[?query][#fragment]
-   */
-
-public:
-
-  enum class scheme_category
-  {
-    Hierarchical,
-    NonHierarchical
-  };
-
-  enum class component
-  {
-    Scheme,
-    Content,
-    Username,
-    Password,
-    Host,
-    Port,
-    Path,
-    Query,
-    Fragment
-  };
-  
-  enum class query_argument_separator
-  {
-    ampersand,
-    semicolon
-  };
-
-  uri(char const *uri_text, scheme_category category = scheme_category::Hierarchical,
-      query_argument_separator separator = query_argument_separator::ampersand) :
-    m_category(category),
-    m_port(0),
-    m_path_is_rooted(false),
-    m_separator(separator)
-  {
-    setup(std::string(uri_text), category);
-  };
-
-  uri(std::string const &uri_text, scheme_category category = scheme_category::Hierarchical,
-      query_argument_separator separator = query_argument_separator::ampersand) : 
-    m_category(category),
-    m_port(0),
-    m_path_is_rooted(false),
-    m_separator(separator)
-  {
-    setup(uri_text, category);
-  };
-
-  uri(std::map<component, std::string> const &components,
-      scheme_category category,
-      bool rooted_path,
-      query_argument_separator separator = query_argument_separator::ampersand) :
-    m_category(category),
-    m_path_is_rooted(rooted_path),
-    m_separator(separator)
-  {
-    if (components.count(component::Scheme))
-    {
-      if (components.at(component::Scheme).length() == 0)
-      {
-	throw std::invalid_argument("Scheme cannot be empty.");
-      }
-      m_scheme = components.at(component::Scheme);
-    }
-    else
-    {
-      throw std::invalid_argument("A URI must have a scheme.");
-    }
+class uri {
+    /* URIs are broadly divided into two categories: hierarchical and
+     * non-hierarchical. Both hierarchical URIs and non-hierarchical URIs have a
+     * few elements in common; all URIs have a scheme of one or more alphanumeric
+     * characters followed by a colon, and they all may optionally have a query
+     * component preceded by a question mark, and a fragment component preceded by
+     * an octothorpe (hash mark: '#'). The query consists of stanzas separated by
+     * either ampersands ('&') or semicolons (';') (but only one or the other),
+     * and each stanza consists of a key and an optional value; if the value
+     * exists, the key and value must be divided by an equals sign.
+     *
+     * The following is an example from Wikipedia of a hierarchical URI:
+     * scheme:[//[user:password@]domain[:port]][/]path[?query][#fragment]
+     */
+
+   public:
+    enum class scheme_category { Hierarchical, NonHierarchical };
+
+    enum class component { Scheme, Content, Username, Password, Host, Port, Path, Query, Fragment };
+
+    enum class query_argument_separator { ampersand, semicolon };
+
+    uri(char const* uri_text,
+        scheme_category category = scheme_category::Hierarchical,
+        query_argument_separator separator = query_argument_separator::ampersand) :
+        m_category(category),
+        m_port(0),
+        m_path_is_rooted(false),
+        m_separator(separator) {
+        setup(std::string(uri_text), category);
+    };
+
+    uri(std::string const& uri_text,
+        scheme_category category = scheme_category::Hierarchical,
+        query_argument_separator separator = query_argument_separator::ampersand) :
+        m_category(category),
+        m_port(0),
+        m_path_is_rooted(false),
+        m_separator(separator) {
+        setup(uri_text, category);
+    };
+
+    uri(std::map<component, std::string> const& components,
+        scheme_category category,
+        bool rooted_path,
+        query_argument_separator separator = query_argument_separator::ampersand) :
+        m_category(category),
+        m_path_is_rooted(rooted_path),
+        m_separator(separator) {
+        if (components.count(component::Scheme)) {
+            if (components.at(component::Scheme).length() == 0) {
+                throw std::invalid_argument("Scheme cannot be empty.");
+            }
+            m_scheme = components.at(component::Scheme);
+        } else {
+            throw std::invalid_argument("A URI must have a scheme.");
+        }
 
-    if (category == scheme_category::Hierarchical)
-    {
-      if (components.count(component::Content))
-      {
-	throw std::invalid_argument("The content component is only for use in non-hierarchical URIs.");
-      }
-
-      bool has_username = components.count(component::Username);
-      bool has_password = components.count(component::Password);
-      if (has_username && has_password)
-      {
-	m_username = components.at(component::Username);
-	m_password = components.at(component::Password);
-      }
-      else if ((has_username && !has_password) || (!has_username && has_password))
-      {
-	throw std::invalid_argument("If a username or password is supplied, both must be provided.");
-      }
-
-      if (components.count(component::Host))
-      {
-	m_host = components.at(component::Host);
-      }
-
-      if (components.count(component::Port))
-      {
-	m_port = std::stoul(components.at(component::Port));
-      }
-
-      if (components.count(component::Path))
-      {
-	m_path = components.at(component::Path);
-      }
-      else
-      {
-	throw std::invalid_argument("A path is required on a hierarchical URI, even an empty path.");
-      }
-    }
-    else
-    {
-      if (components.count(component::Username)
-	  || components.count(component::Password)
-	  || components.count(component::Host)
-	  || components.count(component::Port)
-	  || components.count(component::Path))
-      {
-	throw std::invalid_argument("None of the hierarchical components are allowed in a non-hierarchical URI.");
-      }
-
-      if (components.count(component::Content))
-      {
-	m_content = components.at(component::Content);
-      }
-      else
-      {
-	throw std::invalid_argument("Content is a required component for a non-hierarchical URI, even an empty string.");
-      }
-    }
+        if (category == scheme_category::Hierarchical) {
+            if (components.count(component::Content)) {
+                throw std::invalid_argument("The content component is only for use in non-hierarchical URIs.");
+            }
+
+            bool has_username = components.count(component::Username);
+            bool has_password = components.count(component::Password);
+            if (has_username && has_password) {
+                m_username = components.at(component::Username);
+                m_password = components.at(component::Password);
+            } else if ((has_username && !has_password) || (!has_username && has_password)) {
+                throw std::invalid_argument("If a username or password is supplied, both must be provided.");
+            }
+
+            if (components.count(component::Host)) {
+                m_host = components.at(component::Host);
+            }
+
+            if (components.count(component::Port)) {
+                m_port = std::stoul(components.at(component::Port));
+            }
+
+            if (components.count(component::Path)) {
+                m_path = components.at(component::Path);
+            } else {
+                throw std::invalid_argument("A path is required on a hierarchical URI, even an empty path.");
+            }
+        } else {
+            if (components.count(component::Username) || components.count(component::Password) || components.count(component::Host) ||
+                components.count(component::Port) || components.count(component::Path)) {
+                throw std::invalid_argument("None of the hierarchical components are allowed in a non-hierarchical URI.");
+            }
+
+            if (components.count(component::Content)) {
+                m_content = components.at(component::Content);
+            } else {
+                throw std::invalid_argument("Content is a required component for a non-hierarchical URI, even an empty string.");
+            }
+        }
+
+        if (components.count(component::Query)) {
+            m_query = components.at(component::Query);
+        }
 
-    if (components.count(component::Query))
-    {
-      m_query = components.at(component::Query);
+        if (components.count(component::Fragment)) {
+            m_fragment = components.at(component::Fragment);
+        }
     }
 
-    if (components.count(component::Fragment))
-    {
-      m_fragment = components.at(component::Fragment);
-    } 
-  }    
+    uri(uri const& other, std::map<component, std::string> const& replacements) :
+        m_category(other.m_category),
+        m_path_is_rooted(other.m_path_is_rooted),
+        m_separator(other.m_separator) {
+        m_scheme = (replacements.count(component::Scheme)) ? replacements.at(component::Scheme) : other.m_scheme;
 
-  uri(uri const &other, std::map<component, std::string> const &replacements) :
-    m_category(other.m_category),
-    m_path_is_rooted(other.m_path_is_rooted),
-    m_separator(other.m_separator)
-  {
-    m_scheme = (replacements.count(component::Scheme))
-      ? replacements.at(component::Scheme) : other.m_scheme;
+        if (m_category == scheme_category::Hierarchical) {
+            m_username = (replacements.count(component::Username)) ? replacements.at(component::Username) : other.m_username;
 
-    if (m_category == scheme_category::Hierarchical)
-    {
-      m_username = (replacements.count(component::Username))
-	? replacements.at(component::Username) : other.m_username;
+            m_password = (replacements.count(component::Password)) ? replacements.at(component::Password) : other.m_password;
 
-      m_password = (replacements.count(component::Password))
-	? replacements.at(component::Password) : other.m_password;
+            m_host = (replacements.count(component::Host)) ? replacements.at(component::Host) : other.m_host;
 
-      m_host = (replacements.count(component::Host))
-	? replacements.at(component::Host) : other.m_host;
+            m_port = (replacements.count(component::Port)) ? std::stoul(replacements.at(component::Port)) : other.m_port;
 
-      m_port = (replacements.count(component::Port))
-	? std::stoul(replacements.at(component::Port)) : other.m_port;
+            m_path = (replacements.count(component::Path)) ? replacements.at(component::Path) : other.m_path;
+        } else {
+            m_content = (replacements.count(component::Content)) ? replacements.at(component::Content) : other.m_content;
+        }
 
-      m_path = (replacements.count(component::Path))
-	? replacements.at(component::Path) : other.m_path;
-    }
-    else
-    {
-      m_content = (replacements.count(component::Content))
-	? replacements.at(component::Content) : other.m_content;
+        m_query = (replacements.count(component::Query)) ? replacements.at(component::Query) : other.m_query;
+
+        m_fragment = (replacements.count(component::Fragment)) ? replacements.at(component::Fragment) : other.m_fragment;
+    }
+
+    // Copy constructor; just use the copy assignment operator internally.
+    uri(uri const& other) {
+        *this = other;
+    };
+
+    // Copy assignment operator
+    uri& operator=(uri const& other) {
+        if (this != &other) {
+            m_scheme = other.m_scheme;
+            m_content = other.m_content;
+            m_username = other.m_username;
+            m_password = other.m_password;
+            m_host = other.m_host;
+            m_path = other.m_path;
+            m_query = other.m_query;
+            m_fragment = other.m_fragment;
+            m_query_dict = other.m_query_dict;
+            m_category = other.m_category;
+            m_port = other.m_port;
+            m_path_is_rooted = other.m_path_is_rooted;
+            m_separator = other.m_separator;
+        }
+        return *this;
     }
 
-    m_query = (replacements.count(component::Query))
-      ? replacements.at(component::Query) : other.m_query;
-
-    m_fragment = (replacements.count(component::Fragment))
-      ? replacements.at(component::Fragment) : other.m_fragment;
-  }
-
-  // Copy constructor; just use the copy assignment operator internally.
-  uri(uri const &other)
-  {
-    *this = other;
-  };
-
-  // Copy assignment operator
-  uri &operator=(uri const &other)
-  {
-    if (this != &other)
-    {
-      m_scheme = other.m_scheme;
-      m_content = other.m_content;
-      m_username = other.m_username;
-      m_password = other.m_password;
-      m_host = other.m_host;
-      m_path = other.m_path;
-      m_query = other.m_query;
-      m_fragment = other.m_fragment;
-      m_query_dict = other.m_query_dict;
-      m_category = other.m_category;
-      m_port = other.m_port;
-      m_path_is_rooted = other.m_path_is_rooted;
-      m_separator = other.m_separator;
-    }
-    return *this;
-  }
-
-  ~uri() { };
-
-  std::string const &get_scheme() const
-  {
-    return m_scheme;
-  };
-
-  scheme_category get_scheme_category() const
-  {
-    return m_category;
-  };
-
-  std::string const &get_content() const
-  {
-    if (m_category != scheme_category::NonHierarchical)
-    {
-      throw std::domain_error("The content component is only valid for non-hierarchical URIs.");
-    }
-    return m_content;
-  };
-
-  std::string const &get_username() const
-  {
-    if (m_category != scheme_category::Hierarchical)
-    {
-      throw std::domain_error("The username component is only valid for hierarchical URIs.");
-    }
-    return m_username;
-  };
-
-  std::string const &get_password() const
-  {
-    if (m_category != scheme_category::Hierarchical)
-    {
-      throw std::domain_error("The password component is only valid for hierarchical URIs.");
-    }
-    return m_password;
-  };
-  
-  std::string const &get_host() const
-  {
-    if (m_category != scheme_category::Hierarchical)
-    {
-      throw std::domain_error("The host component is only valid for hierarchical URIs.");
-    }
-    return m_host;
-  };
-
-  unsigned long get_port() const
-  {
-    if (m_category != scheme_category::Hierarchical)
-    {
-      throw std::domain_error("The port component is only valid for hierarchical URIs.");
-    }
-    return m_port;
-  };
-
-  std::string const &get_path() const
-  {
-    if (m_category != scheme_category::Hierarchical)
-    {
-      throw std::domain_error("The path component is only valid for hierarchical URIs.");
-    }
-    return m_path;
-  };
-
-  std::string const &get_query() const
-  {
-    return m_query;
-  };
-
-  std::map<std::string, std::string> const &get_query_dictionary() const
-  {
-    return m_query_dict;
-  };
-
-  std::string const &get_fragment() const
-  {
-    return m_fragment;
-  };
-
-  std::string to_string() const
-  {
-    std::string full_uri;
-    full_uri.append(m_scheme);
-    full_uri.append(":");
-
-    if (m_content.length() > m_path.length())
-    {
-      full_uri.append("//");
-      if (!(m_username.empty() || m_password.empty()))
-      {
-        full_uri.append(m_username);
-        full_uri.append(":");
-        full_uri.append(m_password);
-        full_uri.append("@");
-      }
+    ~uri() { };
+
+    std::string const& get_scheme() const {
+        return m_scheme;
+    };
+
+    scheme_category get_scheme_category() const {
+        return m_category;
+    };
+
+    std::string const& get_content() const {
+        if (m_category != scheme_category::NonHierarchical) {
+            throw std::domain_error("The content component is only valid for non-hierarchical URIs.");
+        }
+        return m_content;
+    };
+
+    std::string const& get_username() const {
+        if (m_category != scheme_category::Hierarchical) {
+            throw std::domain_error("The username component is only valid for hierarchical URIs.");
+        }
+        return m_username;
+    };
+
+    std::string const& get_password() const {
+        if (m_category != scheme_category::Hierarchical) {
+            throw std::domain_error("The password component is only valid for hierarchical URIs.");
+        }
+        return m_password;
+    };
 
-      full_uri.append(m_host);
+    std::string const& get_host() const {
+        if (m_category != scheme_category::Hierarchical) {
+            throw std::domain_error("The host component is only valid for hierarchical URIs.");
+        }
+        return m_host;
+    };
+
+    unsigned long get_port() const {
+        if (m_category != scheme_category::Hierarchical) {
+            throw std::domain_error("The port component is only valid for hierarchical URIs.");
+        }
+        return m_port;
+    };
+
+    std::string const& get_path() const {
+        if (m_category != scheme_category::Hierarchical) {
+            throw std::domain_error("The path component is only valid for hierarchical URIs.");
+        }
+        return m_path;
+    };
 
-      if (m_port != 0)
-      {
+    std::string const& get_query() const {
+        return m_query;
+    };
+
+    std::map<std::string, std::string> const& get_query_dictionary() const {
+        return m_query_dict;
+    };
+
+    std::string const& get_fragment() const {
+        return m_fragment;
+    };
+
+    std::string to_string() const {
+        std::string full_uri;
+        full_uri.append(m_scheme);
         full_uri.append(":");
-        full_uri.append(std::to_string(m_port));
-      }
-    }
 
-    if (m_path_is_rooted)
-    {
-      full_uri.append("/");
-    }
-    full_uri.append(m_path);
+        if (m_content.length() > m_path.length()) {
+            full_uri.append("//");
+            if (!(m_username.empty() || m_password.empty())) {
+                full_uri.append(m_username);
+                full_uri.append(":");
+                full_uri.append(m_password);
+                full_uri.append("@");
+            }
+
+            full_uri.append(m_host);
+
+            if (m_port != 0) {
+                full_uri.append(":");
+                full_uri.append(std::to_string(m_port));
+            }
+        }
 
-    if (!m_query.empty())
-    {
-      full_uri.append("?");
-      full_uri.append(m_query);
-    }
+        if (m_path_is_rooted) {
+            full_uri.append("/");
+        }
+        full_uri.append(m_path);
 
-    if (!m_fragment.empty())
-    {
-      full_uri.append("#");
-      full_uri.append(m_fragment);
-    }
+        if (!m_query.empty()) {
+            full_uri.append("?");
+            full_uri.append(m_query);
+        }
 
-    return full_uri;
-  };
-  
-private:
+        if (!m_fragment.empty()) {
+            full_uri.append("#");
+            full_uri.append(m_fragment);
+        }
 
-  void setup(std::string const &uri_text, scheme_category category)
-  {
-    size_t const uri_length = uri_text.length();
+        return full_uri;
+    };
 
-    if (uri_length == 0)
-    {
-      throw std::invalid_argument("URIs cannot be of zero length.");
-    }
+   private:
+    void setup(std::string const& uri_text, scheme_category category) {
+        size_t const uri_length = uri_text.length();
 
-    std::string::const_iterator cursor = parse_scheme(uri_text, 
-                                                      uri_text.begin());
-    // After calling parse_scheme, *cursor == ':'; none of the following parsers
-    // expect a separator character, so we advance the cursor upon calling them.
-    cursor = parse_content(uri_text, (cursor + 1));
+        if (uri_length == 0) {
+            throw std::invalid_argument("URIs cannot be of zero length.");
+        }
 
-    if ((cursor != uri_text.end()) && (*cursor == '?'))
-    {
-      cursor = parse_query(uri_text, (cursor + 1));
-    }
+        std::string::const_iterator cursor = parse_scheme(uri_text, uri_text.begin());
+        // After calling parse_scheme, *cursor == ':'; none of the following parsers
+        // expect a separator character, so we advance the cursor upon calling them.
+        cursor = parse_content(uri_text, (cursor + 1));
 
-    if ((cursor != uri_text.end()) && (*cursor == '#'))
-    {
-      cursor = parse_fragment(uri_text, (cursor + 1));
-    }
+        if ((cursor != uri_text.end()) && (*cursor == '?')) {
+            cursor = parse_query(uri_text, (cursor + 1));
+        }
 
-    init_query_dictionary(); // If the query string is empty, this will be empty too.
-
-  };
-
-  std::string::const_iterator parse_scheme(std::string const &uri_text,
-					   std::string::const_iterator scheme_start)
-  {
-    std::string::const_iterator scheme_end = scheme_start;
-    while ((scheme_end != uri_text.end()) && (*scheme_end != ':'))
-    {
-      if (!(std::isalnum(*scheme_end) || (*scheme_end == '-')
-	    || (*scheme_end == '+') || (*scheme_end == '.')))
-      {
-	throw std::invalid_argument("Invalid character found in the scheme component. Supplied URI was: \""
-				    + uri_text + "\".");
-      }
-      ++scheme_end;
-    }
+        if ((cursor != uri_text.end()) && (*cursor == '#')) {
+            cursor = parse_fragment(uri_text, (cursor + 1));
+        }
 
-    if (scheme_end == uri_text.end())
-    {
-      throw std::invalid_argument("End of URI found while parsing the scheme. Supplied URI was: \""
-				  + uri_text + "\".");
-    }
+        init_query_dictionary();  // If the query string is empty, this will be empty too.
+    };
 
-    if (scheme_start == scheme_end)
-    {
-      throw std::invalid_argument("Scheme component cannot be zero-length. Supplied URI was: \""
-				  + uri_text + "\".");
-    }
+    std::string::const_iterator parse_scheme(std::string const& uri_text, std::string::const_iterator scheme_start) {
+        std::string::const_iterator scheme_end = scheme_start;
+        while ((scheme_end != uri_text.end()) && (*scheme_end != ':')) {
+            if (!(std::isalnum(*scheme_end) || (*scheme_end == '-') || (*scheme_end == '+') || (*scheme_end == '.'))) {
+                throw std::invalid_argument("Invalid character found in the scheme component. Supplied URI was: \"" + uri_text + "\".");
+            }
+            ++scheme_end;
+        }
 
-    m_scheme = std::string(scheme_start, scheme_end);
-    return scheme_end;
-  };
-
-  std::string::const_iterator parse_content(std::string const &uri_text,
-					    std::string::const_iterator content_start)
-  {
-    std::string::const_iterator content_end = content_start;
-    while ((content_end != uri_text.end()) && (*content_end != '?') && (*content_end != '#'))
-    {
-      ++content_end;
-    }
+        if (scheme_end == uri_text.end()) {
+            throw std::invalid_argument("End of URI found while parsing the scheme. Supplied URI was: \"" + uri_text + "\".");
+        }
 
-    m_content = std::string(content_start, content_end);
-
-    if ((m_category == scheme_category::Hierarchical) && (m_content.length() > 0))
-    {
-      // If it's a hierarchical URI, the content should be parsed for the hierarchical components.
-      std::string::const_iterator path_start = m_content.begin();
-      std::string::const_iterator path_end = m_content.end();
-      if (!m_content.compare(0, 2, "//"))
-      {
-	// In this case an authority component is present.
-	std::string::const_iterator authority_cursor = (m_content.begin() + 2);
-	if (m_content.find_first_of('@') != std::string::npos)
-	{
-	  std::string::const_iterator userpass_divider = parse_username(uri_text,
-									m_content,
-									authority_cursor);
-	  authority_cursor = parse_password(uri_text, m_content, (userpass_divider + 1));
-	  // After this call, *authority_cursor == '@', so we skip over it.
-	  ++authority_cursor;
-	}
-
-	authority_cursor = parse_host(uri_text, m_content, authority_cursor);
-
-	if ((authority_cursor != m_content.end()) && (*authority_cursor == ':'))
-	{
-	  authority_cursor = parse_port(uri_text, m_content, (authority_cursor + 1));
-	}
-
-	if ((authority_cursor != m_content.end()) && (*authority_cursor == '/' ))
-	{
-	  // Then the path is rooted, and we should note this.
-	  m_path_is_rooted = true;
-	  path_start = authority_cursor + 1;
-	}
-	
-	// If we've reached the end and no path is present then set path_start
-        // to the end.
-        if (authority_cursor == m_content.end()) {
-          path_start = m_content.end();
+        if (scheme_start == scheme_end) {
+            throw std::invalid_argument("Scheme component cannot be zero-length. Supplied URI was: \"" + uri_text + "\".");
         }
-      }
-      else if (!m_content.compare(0, 1, "/"))
-      {
-	m_path_is_rooted = true;
-	++path_start;
-      }
-
-      // We can now build the path based on what remains in the content string,
-      // since that's all that exists after the host and optional port component.
-      m_path = std::string(path_start, path_end);
-    }
-    return content_end;
-  };
-
-  std::string::const_iterator parse_username(std::string const &uri_text,
-					     std::string const &content,
-					     std::string::const_iterator username_start)
-  {
-    std::string::const_iterator username_end = username_start;
-    // Since this is only reachable when '@' was in the content string, we can
-    // ignore the end-of-string case.
-    while (*username_end != ':')
-    {
-      if (*username_end == '@')
-      {
-	throw std::invalid_argument("Username must be followed by a password. Supplied URI was: \""
-				    + uri_text + "\".");
-      }
-      ++username_end;
-    }
-    m_username = std::string(username_start, username_end);
-    return username_end;
-  };
-
-  std::string::const_iterator parse_password(std::string const &uri_text,
-					     std::string const &content,
-					     std::string::const_iterator password_start)
-  {
-    std::string::const_iterator password_end = password_start;
-    while (*password_end != '@')
-    {
-      ++password_end;
-    }
 
-    m_password = std::string(password_start, password_end);
-    return password_end;
-  };
-
-  std::string::const_iterator parse_host(std::string const &uri_text,
-					 std::string const &content,
-					 std::string::const_iterator host_start)
-  {
-    std::string::const_iterator host_end = host_start;
-    // So, the host can contain a few things. It can be a domain, it can be an
-    // IPv4 address, it can be an IPv6 address, or an IPvFuture literal. In the
-    // case of those last two, it's of the form [...] where what's between the
-    // brackets is a matter of which IPv?? version it is.
-    while (host_end != content.end())
-    {
-      if (*host_end == '[')
-      {
-	// We're parsing an IPv6 or IPvFuture address, so we should handle that
-	// instead of the normal procedure.
-	while ((host_end != content.end()) && (*host_end != ']'))
-	{
-	  ++host_end;
-	}
-
-	if (host_end == content.end())
-	{
-	  throw std::invalid_argument("End of content component encountered "
-				      "while parsing the host component. "
-				      "Supplied URI was: \""
-				      + uri_text + "\".");
-	}
-
-	++host_end;
-	break;
-	// We can stop looping, we found the end of the IP literal, which is the
-	// whole of the host component when one's in use.
-      }
-      else if ((*host_end == ':') || (*host_end == '/'))
-      {
-	break;
-      }
-      else
-      {
-	++host_end;
-      }
-    }
+        m_scheme = std::string(scheme_start, scheme_end);
+        return scheme_end;
+    };
 
-    m_host = std::string(host_start, host_end);
-    return host_end;
-  };
-
-  std::string::const_iterator parse_port(std::string const &uri_text,
-					std::string const &content,
-					std::string::const_iterator port_start)
-  {
-    std::string::const_iterator port_end = port_start;
-    while ((port_end != content.end()) && (*port_end != '/'))
-    {
-      if (!std::isdigit(*port_end))
-      {
-	throw std::invalid_argument("Invalid character while parsing the port. "
-				    "Supplied URI was: \"" + uri_text + "\".");
-      }
-
-      ++port_end;
-    }
+    std::string::const_iterator parse_content(std::string const& uri_text, std::string::const_iterator content_start) {
+        std::string::const_iterator content_end = content_start;
+        while ((content_end != uri_text.end()) && (*content_end != '?') && (*content_end != '#')) {
+            ++content_end;
+        }
 
-    m_port = std::stoul(std::string(port_start, port_end));
-    return port_end;
-  };
-
-  std::string::const_iterator parse_query(std::string const &uri_text,
-                                          std::string::const_iterator query_start)
-  {
-    std::string::const_iterator query_end = query_start;
-    while ((query_end != uri_text.end()) && (*query_end != '#'))
-    {
-      // Queries can contain almost any character except hash, which is reserved
-      // for the start of the fragment.
-      ++query_end;
-    }
-    m_query = std::string(query_start, query_end);
-    return query_end;
-  };
-
-  std::string::const_iterator parse_fragment(std::string const &uri_text,
-                                             std::string::const_iterator fragment_start)
-  {
-    m_fragment = std::string(fragment_start, uri_text.end());
-    return uri_text.end();
-  };  
-  
-  void init_query_dictionary()
-  {
-    if (!m_query.empty())
-    {
-      // Loop over the query string looking for '&'s, then check each one for
-      // an '=' to find keys and values; if there's not an '=' then the key
-      // will have an empty value in the map.
-      char separator = (m_separator == query_argument_separator::ampersand) ? '&' : ';';
-      size_t carat = 0;
-      size_t stanza_end = m_query.find_first_of(separator);
-      do
-      {
-	std::string stanza = m_query.substr(carat, ((stanza_end != std::string::npos) ? (stanza_end - carat) : std::string::npos));
-	size_t key_value_divider = stanza.find_first_of('=');
-	std::string key = stanza.substr(0, key_value_divider);
-	std::string value;
-	if (key_value_divider != std::string::npos)
-	{
-	  value = stanza.substr((key_value_divider + 1));
-	}
-
-	if (m_query_dict.count(key) != 0)
-	{
-	  throw std::invalid_argument("Bad key in the query string!");
-	}
-
-	m_query_dict.emplace(key, value);
-	carat = ((stanza_end != std::string::npos) ? (stanza_end + 1)
-		 : std::string::npos);
-	stanza_end = m_query.find_first_of(separator, carat);
-      }
-      while ((stanza_end != std::string::npos) 
-	     || (carat != std::string::npos));
+        m_content = std::string(content_start, content_end);
+
+        if ((m_category == scheme_category::Hierarchical) && (m_content.length() > 0)) {
+            // If it's a hierarchical URI, the content should be parsed for the hierarchical components.
+            std::string::const_iterator path_start = m_content.begin();
+            std::string::const_iterator path_end = m_content.end();
+            if (!m_content.compare(0, 2, "//")) {
+                // In this case an authority component is present.
+                std::string::const_iterator authority_cursor = (m_content.begin() + 2);
+                if (m_content.find_first_of('@') != std::string::npos) {
+                    std::string::const_iterator userpass_divider = parse_username(uri_text, m_content, authority_cursor);
+                    authority_cursor = parse_password(uri_text, m_content, (userpass_divider + 1));
+                    // After this call, *authority_cursor == '@', so we skip over it.
+                    ++authority_cursor;
+                }
+
+                authority_cursor = parse_host(uri_text, m_content, authority_cursor);
+
+                if ((authority_cursor != m_content.end()) && (*authority_cursor == ':')) {
+                    authority_cursor = parse_port(uri_text, m_content, (authority_cursor + 1));
+                }
+
+                if ((authority_cursor != m_content.end()) && (*authority_cursor == '/')) {
+                    // Then the path is rooted, and we should note this.
+                    m_path_is_rooted = true;
+                    path_start = authority_cursor + 1;
+                }
+
+                // If we've reached the end and no path is present then set path_start
+                // to the end.
+                if (authority_cursor == m_content.end()) {
+                    path_start = m_content.end();
+                }
+            } else if (!m_content.compare(0, 1, "/")) {
+                m_path_is_rooted = true;
+                ++path_start;
+            }
+
+            // We can now build the path based on what remains in the content string,
+            // since that's all that exists after the host and optional port component.
+            m_path = std::string(path_start, path_end);
+        }
+        return content_end;
+    };
+
+    std::string::const_iterator parse_username(std::string const& uri_text, std::string const& content, std::string::const_iterator username_start) {
+        std::string::const_iterator username_end = username_start;
+        // Since this is only reachable when '@' was in the content string, we can
+        // ignore the end-of-string case.
+        while (*username_end != ':') {
+            if (*username_end == '@') {
+                throw std::invalid_argument("Username must be followed by a password. Supplied URI was: \"" + uri_text + "\".");
+            }
+            ++username_end;
+        }
+        m_username = std::string(username_start, username_end);
+        return username_end;
+    };
+
+    std::string::const_iterator parse_password(std::string const& uri_text, std::string const& content, std::string::const_iterator password_start) {
+        std::string::const_iterator password_end = password_start;
+        while (*password_end != '@') {
+            ++password_end;
+        }
+
+        m_password = std::string(password_start, password_end);
+        return password_end;
+    };
+
+    std::string::const_iterator parse_host(std::string const& uri_text, std::string const& content, std::string::const_iterator host_start) {
+        std::string::const_iterator host_end = host_start;
+        // So, the host can contain a few things. It can be a domain, it can be an
+        // IPv4 address, it can be an IPv6 address, or an IPvFuture literal. In the
+        // case of those last two, it's of the form [...] where what's between the
+        // brackets is a matter of which IPv?? version it is.
+        while (host_end != content.end()) {
+            if (*host_end == '[') {
+                // We're parsing an IPv6 or IPvFuture address, so we should handle that
+                // instead of the normal procedure.
+                while ((host_end != content.end()) && (*host_end != ']')) {
+                    ++host_end;
+                }
+
+                if (host_end == content.end()) {
+                    throw std::invalid_argument(
+                        "End of content component encountered "
+                        "while parsing the host component. "
+                        "Supplied URI was: \"" +
+                        uri_text + "\"."
+                    );
+                }
+
+                ++host_end;
+                break;
+                // We can stop looping, we found the end of the IP literal, which is the
+                // whole of the host component when one's in use.
+            } else if ((*host_end == ':') || (*host_end == '/')) {
+                break;
+            } else {
+                ++host_end;
+            }
+        }
+
+        m_host = std::string(host_start, host_end);
+        return host_end;
+    };
+
+    std::string::const_iterator parse_port(std::string const& uri_text, std::string const& content, std::string::const_iterator port_start) {
+        std::string::const_iterator port_end = port_start;
+        while ((port_end != content.end()) && (*port_end != '/')) {
+            if (!std::isdigit(*port_end)) {
+                throw std::invalid_argument(
+                    "Invalid character while parsing the port. "
+                    "Supplied URI was: \"" +
+                    uri_text + "\"."
+                );
+            }
+
+            ++port_end;
+        }
+
+        m_port = std::stoul(std::string(port_start, port_end));
+        return port_end;
+    };
+
+    std::string::const_iterator parse_query(std::string const& uri_text, std::string::const_iterator query_start) {
+        std::string::const_iterator query_end = query_start;
+        while ((query_end != uri_text.end()) && (*query_end != '#')) {
+            // Queries can contain almost any character except hash, which is reserved
+            // for the start of the fragment.
+            ++query_end;
+        }
+        m_query = std::string(query_start, query_end);
+        return query_end;
+    };
+
+    std::string::const_iterator parse_fragment(std::string const& uri_text, std::string::const_iterator fragment_start) {
+        m_fragment = std::string(fragment_start, uri_text.end());
+        return uri_text.end();
+    };
+
+    void init_query_dictionary() {
+        if (!m_query.empty()) {
+            // Loop over the query string looking for '&'s, then check each one for
+            // an '=' to find keys and values; if there's not an '=' then the key
+            // will have an empty value in the map.
+            char separator = (m_separator == query_argument_separator::ampersand) ? '&' : ';';
+            size_t carat = 0;
+            size_t stanza_end = m_query.find_first_of(separator);
+            do {
+                std::string stanza = m_query.substr(carat, ((stanza_end != std::string::npos) ? (stanza_end - carat) : std::string::npos));
+                size_t key_value_divider = stanza.find_first_of('=');
+                std::string key = stanza.substr(0, key_value_divider);
+                std::string value;
+                if (key_value_divider != std::string::npos) {
+                    value = stanza.substr((key_value_divider + 1));
+                }
+
+                if (m_query_dict.count(key) != 0) {
+                    throw std::invalid_argument("Bad key in the query string!");
+                }
+
+                m_query_dict.emplace(key, value);
+                carat = ((stanza_end != std::string::npos) ? (stanza_end + 1) : std::string::npos);
+                stanza_end = m_query.find_first_of(separator, carat);
+            } while ((stanza_end != std::string::npos) || (carat != std::string::npos));
+        }
     }
-  }
-
-  std::string m_scheme;
-  std::string m_content;
-  std::string m_username;
-  std::string m_password;
-  std::string m_host;
-  std::string m_path;
-  std::string m_query;
-  std::string m_fragment;
-
-  std::map<std::string, std::string> m_query_dict;
-
-  scheme_category m_category;
-  unsigned long m_port;
-  bool m_path_is_rooted;
-  query_argument_separator m_separator;
+
+    std::string m_scheme;
+    std::string m_content;
+    std::string m_username;
+    std::string m_password;
+    std::string m_host;
+    std::string m_path;
+    std::string m_query;
+    std::string m_fragment;
+
+    std::map<std::string, std::string> m_query_dict;
+
+    scheme_category m_category;
+    unsigned long m_port;
+    bool m_path_is_rooted;
+    query_argument_separator m_separator;
 };
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..bd62d25
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,202 @@
+{
+  "name": "graphicstweaks",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "graphicstweaks",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "chokidar": "^3.6.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..828ee6a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "graphicstweaks",
+  "version": "1.0.0",
+  "description": "Mod to unlock pc graphics settings on quest beat saber",
+  "main": "index.js",
+  "scripts": {
+    "watch": "node watch-templates.js"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "chokidar": "^3.6.0"
+  }
+}
diff --git a/qpm.json b/qpm.json
index ec9a72e..c5c8076 100644
--- a/qpm.json
+++ b/qpm.json
@@ -1,4 +1,5 @@
 {
+  "version": "0.4.0",
   "sharedDir": "shared",
   "dependenciesDir": "extern",
   "info": {
@@ -11,6 +12,13 @@
       "cmake": true
     }
   },
+  "workspace": {
+    "scripts": {},
+    "ndk": "^27.2.12479018",
+    "qmodIncludeDirs": [],
+    "qmodIncludeFiles": [],
+    "qmodOutput": null
+  },
   "dependencies": [
     {
       "id": "scotland2",
@@ -42,7 +50,7 @@
     },
     {
       "id": "song-details",
-      "versionRange": "^0.3.6",
+      "versionRange": "^1.0.1",
       "additionalData": {}
     },
     {
@@ -87,6 +95,5 @@
         "private": true
       }
     }
-  ],
-  "additionalData": {}
+  ]
 }
\ No newline at end of file
diff --git a/qpm.shared.json b/qpm.shared.json
index 090f5f5..53ea6eb 100644
--- a/qpm.shared.json
+++ b/qpm.shared.json
@@ -1,6 +1,6 @@
 {
   "config": {
-    "version": "0.1.0",
+    "version": "0.4.0",
     "sharedDir": "shared",
     "dependenciesDir": "extern",
     "info": {
@@ -15,6 +15,7 @@
     },
     "workspace": {
       "scripts": {},
+      "ndk": "^27.2.12479018",
       "qmodIncludeDirs": [],
       "qmodIncludeFiles": [],
       "qmodOutput": null
@@ -50,7 +51,7 @@
       },
       {
         "id": "song-details",
-        "versionRange": "^0.3.6",
+        "versionRange": "^1.0.1",
         "additionalData": {}
       },
       {
@@ -154,28 +155,28 @@
     {
       "dependency": {
         "id": "sombrero",
-        "versionRange": "=0.1.42",
+        "versionRange": "=0.1.43",
         "additionalData": {
           "headersOnly": true,
-          "branchName": "version/v0_1_42"
+          "branchName": "version/v0_1_43"
         }
       },
-      "version": "0.1.42"
+      "version": "0.1.43"
     },
     {
       "dependency": {
         "id": "songcore",
-        "versionRange": "=1.1.15",
+        "versionRange": "=1.1.16",
         "additionalData": {
-          "soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/libsongcore.so",
-          "debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/debug_libsongcore.so",
+          "soLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.16/libsongcore.so",
+          "debugSoLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.16/debug_libsongcore.so",
           "overrideSoName": "libsongcore.so",
-          "modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/SongCore.qmod",
-          "branchName": "version/v1_1_15",
+          "modLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.16/SongCore.qmod",
+          "branchName": "version/v1_1_16",
           "cmake": true
         }
       },
-      "version": "1.1.15"
+      "version": "1.1.16"
     },
     {
       "dependency": {
@@ -195,17 +196,17 @@
     {
       "dependency": {
         "id": "song-details",
-        "versionRange": "=0.3.7",
+        "versionRange": "=1.0.1",
         "additionalData": {
-          "soLink": "https://github.com/bsq-ports/SongDetails/releases/download/v0.3.7/libsongdetails.so",
-          "debugSoLink": "https://github.com/bsq-ports/SongDetails/releases/download/v0.3.7/debug_libsongdetails.so",
+          "soLink": "https://github.com/bsq-ports/SongDetails/releases/download/v1.0.1/libsongdetails.so",
+          "debugSoLink": "https://github.com/bsq-ports/SongDetails/releases/download/v1.0.1/debug_libsongdetails.so",
           "overrideSoName": "libsongdetails.so",
-          "modLink": "https://github.com/bsq-ports/SongDetails/releases/download/v0.3.7/SongDetails.qmod",
-          "branchName": "version/v0_3_7",
+          "modLink": "https://github.com/bsq-ports/SongDetails/releases/download/v1.0.1/SongDetails.qmod",
+          "branchName": "version/v1_0_1",
           "cmake": false
         }
       },
-      "version": "0.3.7"
+      "version": "1.0.1"
     },
     {
       "dependency": {
diff --git a/src/DataHolder.cpp b/src/DataHolder.cpp
new file mode 100644
index 0000000..2e73274
--- /dev/null
+++ b/src/DataHolder.cpp
@@ -0,0 +1,633 @@
+#include "DataHolder.hpp"
+
+#include <regex>
+
+#include "bsml/shared/BSML/MainThreadScheduler.hpp"
+#include "GlobalNamespace/PlayerData.hpp"
+#include "GlobalNamespace/PlayerDataModel.hpp"
+#include "GlobalNamespace/PlayerLevelStatsData.hpp"
+#include "logging.hpp"
+#include "song-details/shared/Data/Song.hpp"
+#include "song-details/shared/Data/SongDifficulty.hpp"
+#include "song-details/shared/SongDetails.hpp"
+#include "System/Collections/Generic/Dictionary_2.hpp"
+#include "Util/CurrentTimeMs.hpp"
+#include "Util/SongUtil.hpp"
+#include "Util/TextUtil.hpp"
+
+using namespace BetterSongSearch::Util;
+
+// Initialize the data holder
+BetterSongSearch::DataHolder BetterSongSearch::dataHolder{};
+
+void BetterSongSearch::DataHolder::Init() {
+    // Subscribe to events
+    SongDetailsCache::SongDetails::dataAvailableOrUpdated += {&DataHolder::SongDataDone, this};
+    SongDetailsCache::SongDetails::dataLoadFailed += {&DataHolder::SongDataError, this};
+
+    // Load configs
+    dataHolder.filterOptions.LoadFromConfig();
+    dataHolder.filterOptionsCache.CopyFrom(dataHolder.filterOptions);
+
+    // set preferred leaderboard
+    std::string preferredLeaderboard = getPluginConfig().PreferredLeaderboard.GetValue();
+    if (LEADERBOARD_MAP.contains(preferredLeaderboard)) {
+        dataHolder.preferredLeaderboard = LEADERBOARD_MAP.at(preferredLeaderboard);
+    } else {
+        dataHolder.preferredLeaderboard = FilterTypes::PreferredLeaderBoard::ScoreSaber;
+        getPluginConfig().PreferredLeaderboard.SetValue("Scoresaber");
+    }
+}
+
+void BetterSongSearch::DataHolder::SongDataDone() {
+    DEBUG("SongDataDone");
+    PreprocessTags();
+    UpdatePlayerScores();
+
+    loading = false;
+    failed = false;
+    loaded = true;
+    needsRefresh = true;
+
+    // Needed if songdetails is loaded in the background by other mods
+    if (this->songDetails == nullptr) {
+        this->songDetails = SongDetailsCache::SongDetails::Init().get();
+    }
+
+    loadingFinished.invoke();
+}
+
+void BetterSongSearch::DataHolder::SongDataError(std::string message) {
+    DEBUG("SongDataFailed");
+
+    loading = false;
+    failed = true;
+    loaded = false;
+    needsRefresh = false;
+
+    loadingFailed.invoke(message);
+}
+
+void BetterSongSearch::DataHolder::DownloadSongList() {
+    DEBUG("DownloadSongList");
+    if (this->loading) {
+        return;
+    }
+
+    std::thread([this] {
+        this->loading = true;
+        this->songDetails = SongDetailsCache::SongDetails::Init().get();
+
+        if (!this->songDetails->songs.get_isDataAvailable()) {
+            this->SongDataError("Failed to load song data");
+        } else {
+            this->SongDataDone();
+        }
+    }).detach();
+}
+
+void BetterSongSearch::DataHolder::PreprocessTags() {
+    auto& mapStyles = MAP_STYLES_OPTIONS;
+
+    std::vector<PreprocessedTag> tags;
+
+    for (auto tag : songDetails->tags) {
+        std::string tagString = tag.first;
+        uint64_t mask = tag.second;
+
+        bool isStyle = mapStyles.end() != std::find(mapStyles.begin(), mapStyles.end(), tagString);
+
+        if (isStyle) {
+            continue;
+        }
+
+        // Count songs
+        uint32_t songCount = 0;
+        for (auto& song : songDetails->songs) {
+            if ((song.tags & mask) == mask) {
+                songCount++;
+            }
+        }
+
+        tags.push_back({tagString, mask, songCount, false});
+    }
+
+    // Sort by alphabetical order
+    std::sort(tags.begin(), tags.end(), [](PreprocessedTag const& a, PreprocessedTag const& b) {
+        return a.tag < b.tag;
+    });
+
+    // Replace the tags with the preprocessed ones
+    this->tags = tags;
+}
+
+void BetterSongSearch::DataHolder::UpdatePlayerScores() {
+    static std::atomic_bool updating = false;  // Prevent multiple checks at once
+    if (updating) {
+        return;
+    }
+    updating = true;
+
+    // Run in a separate thread
+    il2cpp_utils::il2cpp_aware_thread([this] {
+        try {
+            DEBUG("Updating player scores");
+            long long before = CurrentTimeMs();
+
+            if (!playerDataModel) {
+                WARNING("No player data model, cannot update scores");
+                updating = false;
+                return;
+            }
+
+            auto playerData = playerDataModel->get_playerData();
+            if (!playerData) {
+                WARNING("No player data, cannot update scores");
+                updating = false;
+                return;
+            }
+
+            auto statsData = playerData->get_levelsStatsData();
+            if (!statsData) {
+                WARNING("No stats data, cannot update scores");
+                updating = false;
+                return;
+            }
+
+            if (!this->songDetails || !this->songDetails->songs.get_isDataAvailable()) {
+                WARNING("No song details, cannot update scores");
+                updating = false;
+                return;
+            }
+
+            auto statsDataEnumerator = statsData->GetEnumerator();
+
+            std::unordered_set<std::string> songsWithScoresTemp;
+
+            while (statsDataEnumerator.MoveNext()) {
+                auto statsDataKeys = statsDataEnumerator.get_Current();
+                auto x = statsDataKeys.value;
+
+                if (!x->get_validScore() || x->get_highScore() == 0 || x->get_levelID()->get_Length() < 13 + 40) {
+                    continue;
+                }
+                std::u16string_view levelid = x->get_levelID();
+                if (!levelid.starts_with(u"custom_level_")) {
+                    continue;
+                };
+                auto sh = std::regex_replace((std::string) x->get_levelID(), std::basic_regex("custom_level_"), "");
+
+                auto& song = dataHolder.songDetails->songs.FindByHash(sh);
+
+                if (song == SongDetailsCache::Song::none) {
+                    continue;
+                }
+
+                bool foundDiff = false;
+
+                for (auto& diff : song) {
+                    if (diff.difficulty == SongDetailsCache::MapDifficulty((int) x->____difficulty.value__)) {
+                        foundDiff = true;
+                        break;
+                    }
+                }
+                if (!foundDiff) {
+                    continue;
+                }
+
+                songsWithScoresTemp.insert(sh);
+            }
+            INFO("local scores checked. found {}", songsWithScoresTemp.size());
+
+            std::unique_lock<std::shared_mutex> lock(mutex_songsWithScores);
+            bool firstLoad = songsWithScores.empty() && songsWithScoresTemp.size() > 0;
+            bool isChanged = songsWithScores.size() != songsWithScoresTemp.size();
+            bool isEmpty = songsWithScoresTemp.empty() && songsWithScores.empty();
+            songsWithScoresTemp.swap(songsWithScores);
+            lock.unlock();
+
+            updating = false;
+
+            INFO("Updated player scores in {} ms", CurrentTimeMs() - before);
+
+            if (isChanged && !isEmpty) {
+                BSML::MainThreadScheduler::Schedule([this, firstLoad] {
+                    playerDataLoaded.invoke();
+                    // Make another search if we have the filter set and run the first time
+                    {
+                        if (firstLoad && !this->searchInProgress && this->filterOptions.getLocalScoreType() != FilterTypes::LocalScoreFilter::All) {
+                            this->Search();
+                        }
+                    }
+                });
+            }
+        } catch (...) {
+            WARNING("Failed to update player scores");
+            updating = false;
+        }
+    });
+}
+
+bool BetterSongSearch::DataHolder::SongHasScore(std::string_view songhash) {
+    std::shared_lock<std::shared_mutex> lock(mutex_songsWithScores);
+    if (this->songsWithScores.empty()) {
+        return false;
+    }
+    return this->songsWithScores.contains(songhash.data());
+}
+
+bool BetterSongSearch::DataHolder::SongHasScore(SongDetailsCache::Song const* song) {
+    return SongHasScore(song->hash());
+}
+
+void BetterSongSearch::DataHolder::SongListUIDone() {
+    this->searchInProgress = false;
+}
+
+struct xd {
+    SongDetailsCache::Song const* song;
+    float searchWeight;
+    float sortWeight;
+};
+
+void BetterSongSearch::DataHolder::Search() {
+    DEBUG("BetterSongSearch::DataHolder::Search called");
+    // Skip if song details is null or if data is not loaded yet
+    if (this->songDetails == nullptr || !this->songDetails->songs.get_isDataAvailable()) {
+        DEBUG("Skipping search as song details are not loaded yet");
+        return;
+    };
+
+    // Skip if we have no songs
+    int totalSongs = this->songDetails->songs.size();
+    DEBUG("Total songs: {}", totalSongs);
+    if (totalSongs == 0) {
+        return;
+    }
+    if (this->searchInProgress) {
+        return;
+    }
+
+    this->searchInProgress = true;
+
+    // Detect changes
+    bool currentSortChanged = this->sort != this->currentSort;
+    bool currentSearchChanged = this->search != this->currentSearch;
+    bool currentFilterChanged = !this->filterOptionsCache.IsEqual(this->filterOptions);
+    bool currentForceReload = this->forceReload;
+    DEBUG(
+        "Current sort changed: {}, current search changed: {}, filter changed: {}, force reload: {}",
+        currentSortChanged,
+        currentSearchChanged,
+        currentFilterChanged,
+        currentForceReload
+    );
+    if (!currentForceReload && !currentSortChanged && !currentSearchChanged && !currentFilterChanged) {
+        this->searchInProgress = false;
+        DEBUG("Skipping search as nothing changed");
+        return;
+    }
+
+    if (currentForceReload) {
+        DEBUG("Force reload");
+        this->forceReload = false;
+    }
+
+    // Take a snapshot of current filter options
+    this->filterOptionsCache.CopyFrom(this->filterOptions);
+
+    // Calculate temp values
+    this->filterOptionsCache.RecalculatePreprocessedValues();
+
+    DEBUG("SEARCHING");
+    this->filterOptionsCache.PrintToDebug();
+
+    // Grab current values for sort and search
+    auto currentSort = this->sort;
+    // Current search (processed)
+    auto currentSearch = toLower(this->search);
+
+    // Save
+    this->currentSort = this->sort;
+    this->currentSearch = this->search;
+
+    std::thread([this, currentSearch, currentSort, currentFilterChanged, currentSortChanged, currentSearchChanged, currentForceReload] {
+        long long before = CurrentTimeMs();
+
+        // 4 threads are fine
+        int const num_threads = 4;
+        std::thread t[num_threads];
+
+        // Filter songs if needed
+        if (currentFilterChanged || currentForceReload) {
+            DEBUG("Filtering");
+            int totalSongs = this->songDetails->songs.size();
+            this->filteredSongList.clear();
+            if (this->filterOptionsCache.IsDefault()) {
+                DEBUG("Filtering skipped");
+                this->filteredSongList.reserve(totalSongs);
+                for (auto& song : this->songDetails->songs) {
+                    this->filteredSongList.push_back(&song);
+                }
+            } else {
+                // Set up variables for threads
+                std::mutex valuesMutex;
+                std::atomic_int index = 0;
+
+                // Launch a group of threads
+                for (int i = 0; i < num_threads; ++i) {
+                    t[i] = std::thread([&index, &valuesMutex, totalSongs, this]() {
+                        int i = index++;
+                        while (i < totalSongs) {
+                            SongDetailsCache::Song const& item = this->songDetails->songs.at(i);
+                            bool meetsFilter = MeetsFilter(&item);
+                            if (meetsFilter) {
+                                std::lock_guard<std::mutex> lock(valuesMutex);
+                                filteredSongList.push_back(&item);
+                            }
+                            i = index++;
+                        }
+                    });
+                }
+
+                // Join the threads with the main thread
+                for (int i = 0; i < num_threads; ++i) {
+                    t[i].join();
+                }
+            }
+        }
+
+        INFO("Filtered in {} ms", CurrentTimeMs() - before);
+
+        if (currentFilterChanged || currentSearchChanged || currentSortChanged || currentForceReload) {
+            if (currentSearch.length() > 0) {
+                auto words = split(currentSearch, " ");
+                DEBUG("Words length {}", words.size());
+                for (int i = 0; i < words.size(); i++) {
+                    DEBUG("Search term: '{}'", words[i]);
+                };
+
+                // TODO: Process song key
+                uint32_t possibleSongKey = 0;
+                // Try to parse song key if 1 word from 2 to 7 letters
+                if (words.size() == 1 && currentSearch.length() >= 2 && currentSearch.length() <= 7) {
+                    try {
+                        possibleSongKey = static_cast<uint32_t>(std::stoul(currentSearch, nullptr, 16));
+                    } catch (...) {
+                    }
+                }
+
+                float maxSearchWeight = 0.0f;
+                float maxSortWeight = 0.0f;
+
+                DEBUG("Searching");
+                long long before = CurrentTimeMs();
+                this->searchedSongList.clear();
+                // Set up variables for threads
+                int totalSongs = this->filteredSongList.size();
+
+                std::mutex valuesMutex;
+                std::atomic_int index = 0;
+
+                // Prefiltered songs
+                std::vector<xd> prefiltered;
+
+                // Launch a group of threads
+                for (int i = 0; i < num_threads; ++i) {
+                    t[i] = std::thread(
+                        [this,
+                         &index,
+                         &valuesMutex,
+                         totalSongs,
+                         currentSearch,
+                         words,
+                         &prefiltered,
+                         &maxSearchWeight,
+                         &maxSortWeight,
+                         currentSort,
+                         possibleSongKey](std::vector<std::string> searchQuery) {
+                            int j = index++;
+                            while (j < totalSongs) {
+                                auto songe = this->filteredSongList[j];
+
+                                float resultWeight = 0;
+                                bool matchedAuthor = false;
+                                int prevMatchIndex = -1;
+
+                                std::string songName = removeSpecialCharacter(toLower(songe->songName()));
+                                std::string songAuthorName = removeSpecialCharacter(toLower(songe->songAuthorName()));
+                                std::string levelAuthorName = removeSpecialCharacter(toLower(songe->levelAuthorName()));
+                                uint32_t songKey = songe->mapId();
+
+                                // If song key is present and mapid == songkey, pull it to the top
+                                if (possibleSongKey != 0 && songKey == possibleSongKey) {
+                                    resultWeight = 30;
+                                }
+
+                                // Find full match author name
+                                int authorFullMatch = currentSearch.find(songAuthorName);
+
+                                // set up i for the loop
+                                int i = 0;
+
+                                if (songAuthorName.length() > 4 && authorFullMatch != std::string::npos &&
+                                    // Checks if there is a space after the supposedly matched author name
+                                    (currentSearch.length() == songAuthorName.length() || IsSpace(currentSearch[songAuthorName.length()]))) {
+                                    matchedAuthor = true;
+                                    resultWeight += songAuthorName.length() > 5 ? 25 : 20;
+
+                                    // If the author is matched and is the first, then skip first word (i + 1)
+                                    // This is super cheapskate - I'd have to replace the author from the filter and recreate the words array otherwise
+                                    if (authorFullMatch == 0) {
+                                        i = 1;
+                                    }
+                                }
+
+                                // Go over a list of words
+                                for (; i < words.size(); i++) {
+                                    // If the word matches the author 1:1 thats cool innit
+                                    // If author name is not empty
+                                    if (songAuthorName.length() != 0) {
+                                        // If not matched author and author name == word then add weight, skip if author is already matched
+                                        if (!matchedAuthor && songAuthorName == words[i]) {
+                                            matchedAuthor = true;
+                                            // 3*length of the word divided by 2? wtf
+                                            resultWeight += 3 * (words[i].length() / 2);
+
+                                            // Go to next word
+                                            continue;
+                                            // Otherwise we'll have to check if its contained within this word
+                                        } else if (!matchedAuthor && words[i].length() >= 3) {
+                                            int index = songAuthorName.find(words[i]);
+
+                                            // If found in the beginning or is space at the end of author name which means we matched the beginning of
+                                            // a word
+                                            if (index == 0 || (index > 0 && IsSpace(songAuthorName[index - 1]))) {
+                                                matchedAuthor = true;
+                                                // Add weight
+                                                resultWeight +=
+                                                    (int) round((index == 0 ? 4.0f : 3.0f) * ((float) words[i].length() / songAuthorName.length()));
+                                                continue;
+                                            }
+                                        }
+                                    }
+
+                                    int matchpos = songName.find(words[i]);
+                                    if (matchpos != std::string::npos) {
+                                        // Check if we matched the beginning of a word
+                                        bool wordStart = matchpos == 0 || songName[matchpos - 1] == ' ';
+
+                                        // If it was the beginning add 5 weighting, else 3
+                                        resultWeight += wordStart ? 5 : 3;
+
+                                        ///////////////// New algo  /////////////////////////
+                                        // Find the position in the name
+                                        int posInName = matchpos + words[i].length();
+
+                                        /*
+                                         * Check if we are at the end of the song name, but only if it has at least 8 characters
+                                         * We do this because otherwise, when searching for "lowermost revolt", songs where the
+                                         * songName is exactly "lowermost revolt" would have a lower result weight than
+                                         * "lowermost revolt (JoeBama cover)"
+                                         *
+                                         * The 8 character limitation for this is so that super short words like "those" dont end
+                                         * up triggering this
+                                         */
+                                        if (songName.length() >= 6 && songName.length() == posInName) {
+                                            resultWeight += 3;
+                                        } else {
+                                            // If we did match the beginning, check if we matched an entire word. Get the end index as indicated by
+                                            // our needle
+                                            bool maybeWordEnd = wordStart && posInName < songName.length();
+
+                                            // Check if we actually end up at a non word char, if so add 2 weighting
+                                            if (maybeWordEnd && songName[matchpos + words[i].length()] == ' ') {
+                                                resultWeight += 2;
+                                            }
+                                        }
+                                        /////////////////////////////////////////////////////
+
+                                        //// Old algo for testing pc compatibility (comment out new algo and uncomment this for comparison with PC)
+                                        /////////////
+                                        // bool maybeWordEnd = wordStart && matchpos + words[i].length() < songName.length();
+
+                                        // // Check if we actually end up at a non word char, if so add 2 weighting
+                                        // if(maybeWordEnd && songName[matchpos + words[i].length()] == ' ')
+                                        //     resultWeight += 2;
+                                        ////////////////////////////////////////////////////
+
+                                        // If the word we just checked is behind the previous matched, add another 1 weight
+                                        if (prevMatchIndex != -1 && matchpos > prevMatchIndex) {
+                                            resultWeight += 1;
+                                        }
+
+                                        prevMatchIndex = matchpos;
+                                    }
+                                }
+
+                                for (i = 0; i < words.size(); i++) {
+                                    if (words[i].length() > 3 && levelAuthorName.find(words[i]) != std::string::npos) {
+                                        resultWeight += 1;
+                                        break;
+                                    }
+                                }
+
+                                if (resultWeight > 0) {
+                                    float sortWeight = sortFunctionMap.at(currentSort)(songe);
+
+                                    std::lock_guard<std::mutex> lock(valuesMutex);
+
+                                    prefiltered.push_back({songe, resultWeight, sortWeight});
+
+                                    // #if DEBUG
+                                    //                         x.sortWeight = sortWeight;
+                                    //                         x.resultWeight = resultWeight;
+                                    // #endif
+                                    if (maxSearchWeight < resultWeight) {
+                                        maxSearchWeight = resultWeight;
+                                    }
+
+                                    if (maxSortWeight < sortWeight) {
+                                        maxSortWeight = sortWeight;
+                                    }
+                                }
+                                j = index++;
+                            }
+                        },
+                        words
+                    );
+                }
+
+                // Join the threads with the main thread
+                for (int i = 0; i < num_threads; ++i) {
+                    t[i].join();
+                }
+
+                INFO("Calculated search indexes in {} ms", CurrentTimeMs() - before);
+                if (prefiltered.size() == 0) {
+                    this->searchedSongList.clear();
+                } else {
+                    long long before = CurrentTimeMs();
+                    float maxSearchWeightInverse = 1.0f / maxSearchWeight;
+                    float maxSortWeightInverse = 1.0f / maxSortWeight;
+
+                    // Calculate total search weight
+                    for (auto& item : prefiltered) {
+                        float searchWeight = item.searchWeight * maxSearchWeightInverse;
+                        item.searchWeight = searchWeight + std::min(searchWeight / 2, item.sortWeight * maxSortWeightInverse * (searchWeight / 2));
+                    }
+
+                    std::stable_sort(prefiltered.begin(), prefiltered.end(), [](xd const& s1, xd const& s2) {
+                        return s1.searchWeight > s2.searchWeight;
+                    });
+
+                    this->searchedSongList.reserve(prefiltered.size());
+                    for (auto& x : prefiltered) {
+                        this->searchedSongList.push_back(x.song);
+                    }
+                    INFO("sorted search results in {} ms", CurrentTimeMs() - before);
+                }
+            } else {
+                long long before = CurrentTimeMs();
+
+                std::vector<xd> prefiltered;
+                auto sortFunction = sortFunctionMap.at(currentSort);
+                for (auto item : filteredSongList) {
+                    auto score = sortFunction(item);
+                    prefiltered.push_back({item, 0, score});
+                }
+
+                std::stable_sort(prefiltered.begin(), prefiltered.end(), [](xd const& s1, xd const& s2) {
+                    return s1.sortWeight > s2.sortWeight;
+                });
+
+                this->searchedSongList.clear();
+                this->searchedSongList.reserve(this->filteredSongList.size());
+
+                // Push to searched
+                for (auto& x : prefiltered) {
+                    this->searchedSongList.push_back(x.song);
+                }
+
+                INFO("Sort without search in {} ms", CurrentTimeMs() - before);
+            }
+        }
+
+        DEBUG("Search time: {}ms", CurrentTimeMs() - before);
+        DEBUG("Found {} songs", searchedSongList.size());
+
+        // Replace the list with the searched one in the main thread to prevent unsafe stuff
+        BSML::MainThreadScheduler::Schedule([this] {
+            DEBUG("Clearing displayedSongList");
+            // Copy the list to the displayed one
+            this->displayedSongList.clear();
+            this->displayedSongList = this->searchedSongList;
+
+            DEBUG("Found {} songs", this->displayedSongList.size());
+
+            this->searchInProgress = false;
+
+            this->searchEnded.invoke();
+        });
+    }).detach();
+}
diff --git a/src/FilterOptions.cpp b/src/FilterOptions.cpp
new file mode 100644
index 0000000..1443b72
--- /dev/null
+++ b/src/FilterOptions.cpp
@@ -0,0 +1,375 @@
+#include "FilterOptions.hpp"
+
+#include "DataHolder.hpp"
+#include "logging.hpp"
+#include "main.hpp"
+#include "Util/TextUtil.hpp"
+
+using namespace rapidjson;
+using namespace UnityEngine;
+using namespace BetterSongSearch::Util;
+
+bool BetterSongSearch::FilterProfile::IsDefault() {
+    // clang-format off
+    return (
+        downloadType == (int)FilterTypes::DownloadFilter::All &&
+        localScoreType ==  (int)FilterTypes::LocalScoreFilter::All &&
+        (maxLength / 60 >= SONG_LENGTH_FILTER_MAX) &&
+        (minLength == 0) &&
+        minNJS == 0 &&
+        maxNJS >= NJS_FILTER_MAX &&
+        minNPS == 0 &&
+        maxNPS >= NPS_FILTER_MAX &&
+        rankedType == (int)FilterTypes::RankedFilter::ShowAll &&
+        minStars == 0 &&
+        maxStars >= STAR_FILTER_MAX &&
+        minUploadDate == BEATSAVER_EPOCH &&
+        minUploadDateInMonths == 0 &&
+        minRating == 0 &&
+        minVotes == 0 &&
+        uploaders.empty() &&
+        difficultyFilter == (int)FilterTypes::DifficultyFilter::All &&
+        charFilter == (int)FilterTypes::CharFilter::All &&
+        modRequirement == (int)FilterTypes::Requirement::Any &&
+        !onlyCuratedMaps &&
+        !onlyVerifiedMappers &&
+        !onlyV3Maps &&
+        mapStyleString == "All" &&
+        mapGenreString == "" &&
+        mapGenreExcludeString == ""
+    );
+    // clang-format on
+}
+
+void BetterSongSearch::FilterProfile::LoadFromConfig() {
+    downloadType = getPluginConfig().DownloadType.GetValue();
+    localScoreType = getPluginConfig().LocalScoreType.GetValue();
+    minLength = getPluginConfig().MinLength.GetValue();
+    maxLength = getPluginConfig().MaxLength.GetValue();
+    minNJS = getPluginConfig().MinNJS.GetValue();
+    maxNJS = getPluginConfig().MaxNJS.GetValue();
+    minNPS = getPluginConfig().MinNPS.GetValue();
+    maxNPS = getPluginConfig().MaxNPS.GetValue();
+    rankedType = getPluginConfig().RankedType.GetValue();
+    minStars = getPluginConfig().MinStars.GetValue();
+    maxStars = getPluginConfig().MaxStars.GetValue();
+    minUploadDate = getPluginConfig().MinUploadDate.GetValue();
+    minRating = getPluginConfig().MinRating.GetValue();
+    minVotes = getPluginConfig().MinVotes.GetValue();
+    charFilter = getPluginConfig().CharacteristicType.GetValue();
+    difficultyFilter = getPluginConfig().DifficultyType.GetValue();
+    modRequirement = getPluginConfig().RequirementType.GetValue();
+    minUploadDateInMonths = getPluginConfig().MinUploadDateInMonths.GetValue();
+    onlyCuratedMaps = getPluginConfig().OnlyCuratedMaps.GetValue();
+    onlyVerifiedMappers = getPluginConfig().OnlyVerifiedMappers.GetValue();
+    onlyV3Maps = getPluginConfig().OnlyV3Maps.GetValue();
+    mapStyleString = getPluginConfig().MapStyleString.GetValue();
+    mapGenreString = getPluginConfig().MapGenreString.GetValue();
+    mapGenreExcludeString = getPluginConfig().MapGenreExcludeString.GetValue();
+
+    // Custom string loader
+    auto uploadersString = getPluginConfig().Uploaders.GetValue();
+    if (!uploadersString.empty()) {
+        if (uploadersString[0] == '!') {
+            uploadersString.erase(0, 1);
+            uploadersBlackList = true;
+        } else {
+            uploadersBlackList = false;
+        }
+        uploaders = split(toLower(uploadersString), " ");
+    } else {
+        uploaders.clear();
+    }
+}
+
+void BetterSongSearch::FilterProfile::SaveToConfig() {
+    getPluginConfig().DownloadType.SetValue((int) downloadType, false);
+    getPluginConfig().LocalScoreType.SetValue((int) localScoreType, false);
+    getPluginConfig().MinLength.SetValue(minLength, false);
+    getPluginConfig().MaxLength.SetValue(maxLength, false);
+    getPluginConfig().MinNJS.SetValue(minNJS, false);
+    getPluginConfig().MaxNJS.SetValue(maxNJS, false);
+    getPluginConfig().MinNPS.SetValue(minNPS, false);
+    getPluginConfig().MaxNPS.SetValue(maxNPS, false);
+    getPluginConfig().RankedType.SetValue((int) rankedType, false);
+    getPluginConfig().MinStars.SetValue(minStars, false);
+    getPluginConfig().MaxStars.SetValue(maxStars, false);
+    getPluginConfig().MinUploadDate.SetValue(minUploadDate, false);
+    getPluginConfig().MinRating.SetValue(minRating, false);
+    getPluginConfig().MinVotes.SetValue(minVotes, false);
+    getPluginConfig().CharacteristicType.SetValue((int) charFilter, false);
+    getPluginConfig().DifficultyType.SetValue((int) difficultyFilter, false);
+    getPluginConfig().RequirementType.SetValue((int) modRequirement, false);
+    getPluginConfig().MinUploadDateInMonths.SetValue(minUploadDateInMonths, false);
+    getPluginConfig().OnlyCuratedMaps.SetValue(onlyCuratedMaps, false);
+    getPluginConfig().OnlyVerifiedMappers.SetValue(onlyVerifiedMappers, false);
+    getPluginConfig().OnlyV3Maps.SetValue(onlyV3Maps, false);
+    getPluginConfig().MapStyleString.SetValue(mapStyleString, false);
+    getPluginConfig().MapGenreString.SetValue(mapGenreString, false);
+    getPluginConfig().MapGenreExcludeString.SetValue(mapGenreExcludeString, false);
+
+    getPluginConfig().Uploaders.SetValue((uploadersBlackList ? "!" : "") + join(uploaders, " "), false);
+
+    getPluginConfig().Save();
+}
+
+void BetterSongSearch::FilterProfile::CopyFrom(FilterProfile const& other) {
+    downloadType = other.downloadType;
+    localScoreType = other.localScoreType;
+    minLength = other.minLength;
+    maxLength = other.maxLength;
+    minNJS = other.minNJS;
+    maxNJS = other.maxNJS;
+    minNPS = other.minNPS;
+    maxNPS = other.maxNPS;
+    rankedType = other.rankedType;
+    minStars = other.minStars;
+    maxStars = other.maxStars;
+    minUploadDate = other.minUploadDate;
+    minRating = other.minRating;
+    minVotes = other.minVotes;
+    charFilter = other.charFilter;
+    difficultyFilter = other.difficultyFilter;
+    modRequirement = other.modRequirement;
+    minUploadDateInMonths = other.minUploadDateInMonths;
+    onlyCuratedMaps = other.onlyCuratedMaps;
+    onlyVerifiedMappers = other.onlyVerifiedMappers;
+    onlyV3Maps = other.onlyV3Maps;
+    mapStyleString = other.mapStyleString;
+    mapGenreString = other.mapGenreString;
+    mapGenreExcludeString = other.mapGenreExcludeString;
+    uploaders = other.uploaders;
+    uploadersBlackList = other.uploadersBlackList;
+}
+
+std::optional<BetterSongSearch::FilterProfile> BetterSongSearch::FilterProfile::LoadFromPreset(std::string presetName) {
+    std::string presetsDir = getDataDir(modInfo) + "/Presets/";
+
+    // Ensure the directory exists
+    if (!direxists(presetsDir)) {
+        mkpath(presetsDir);
+    }
+
+    std::string path = presetsDir + presetName + ".json";
+
+    if (!fileexists(path)) {
+        return std::nullopt;
+    }
+
+    try {
+        DEBUG("Loading preset: {}", presetName);
+        auto preset = ReadFromFile<FilterProfile>(path);
+        preset.PrintToDebug();
+        DEBUG("Loaded preset: {}", presetName);
+        return preset;
+    } catch (std::exception const& e) {
+        ERROR("Failed to load preset: {}", e.what());
+        return std::nullopt;
+    }
+}
+
+bool BetterSongSearch::FilterProfile::SaveToPreset(std::string presetName) const {
+    std::string presetsDir = getDataDir(modInfo) + "/Presets/";
+
+    // Ensure the directory exists
+    if (!direxists(presetsDir)) {
+        mkpath(presetsDir);
+    }
+
+    std::string path = presetsDir + presetName + ".json";
+
+    try {
+        DEBUG("Saving preset: {}", presetName);
+        WriteToFile<FilterProfile>(path, *this);
+        DEBUG("Saved preset: {}", presetName);
+        return true;
+    } catch (...) {
+        ERROR("Failed to save preset: {}", presetName);
+        return false;
+    }
+}
+
+std::vector<std::string> BetterSongSearch::FilterProfile::GetPresetList() {
+    std::vector<std::string> presetNames;
+
+    std::string presetsDir = getDataDir(modInfo) + "/Presets/";
+
+    // Ensure the directory exists
+    if (!direxists(presetsDir)) {
+        mkpath(presetsDir);
+    }
+
+    if (!std::filesystem::is_directory(presetsDir)) {
+        return presetNames;
+    }
+
+    std::error_code ec;
+    auto directory_iterator = std::filesystem::directory_iterator(presetsDir, std::filesystem::directory_options::none, ec);
+    for (auto const& entry : directory_iterator) {
+        if (!entry.is_regular_file()) {
+            continue;
+        }
+        std::string file_extension = entry.path().extension().string();
+        std::string raw_file_name = entry.path().filename().replace_extension().string();
+        if (file_extension == ".json") {
+            presetNames.push_back(raw_file_name);
+        }
+    }
+    std::sort(presetNames.begin(), presetNames.end(), [](std::string& a, std::string& b) {
+        return a < b;
+    });
+
+    return presetNames;
+}
+
+static uint64_t CalculateTagsBitfield(std::string tags) {
+    if (tags == "" || BetterSongSearch::dataHolder.songDetails == nullptr) {
+        return 0;
+    }
+
+    std::vector<std::string> items = split(toLower(tags), " ");
+
+    // Remove empty strings
+    items.erase(
+        std::remove_if(
+            items.begin(),
+            items.end(),
+            [](std::string const& s) {
+                return s.empty();
+            }
+        ),
+        items.end()
+    );
+
+    uint64_t res = 0;
+
+    for (auto& t : items) {
+        // If it doesnt exist, the default for numbers is 0, and when we add that to an int nothing changes lohl
+        uint64_t x = BetterSongSearch::dataHolder.songDetails->tags.at(t);
+        res |= x;
+    }
+
+    return res;
+}
+
+void BetterSongSearch::FilterProfile::RecalculatePreprocessedValues() {
+    if (charFilter == (int) FilterTypes::CharFilter::All) {
+        charFilterPreprocessed = SongDetailsCache::MapCharacteristic::Custom;
+    } else {
+        charFilterPreprocessed = CHARACTERISTIC_MAP.at((FilterTypes::CharFilter) charFilter);
+    }
+
+    if (difficultyFilter == (int) FilterTypes::DifficultyFilter::All) {
+        difficultyFilterPreprocessed = SongDetailsCache::MapDifficulty::Easy;
+    } else {
+        difficultyFilterPreprocessed = DIFFICULTY_MAP.at((FilterTypes::DifficultyFilter) difficultyFilter);
+    }
+
+    isDefaultPreprocessed = IsDefault();
+
+    // Calculate bit fields
+    _mapStyleBitfield = CalculateTagsBitfield(mapStyleString);
+    _mapGenreBitfield = CalculateTagsBitfield(mapGenreString);
+    _mapGenreExcludeBitfield = CalculateTagsBitfield(mapGenreExcludeString);
+}
+
+std::tuple<int, int> BetterSongSearch::FilterProfile::CountTags() {
+    int included = 0;
+    int excluded = 0;
+
+    if (mapGenreString != "") {
+        included += split(mapGenreString, " ").size();
+    }
+
+    if (mapGenreExcludeString != "") {
+        excluded += split(mapGenreExcludeString, " ").size();
+    }
+
+    return {included, excluded};
+}
+
+bool BetterSongSearch::FilterProfile::DeletePreset(std::string presetName) {
+    std::string presetsDir = getDataDir(modInfo) + "/Presets/";
+
+    // Ensure the directory exists
+    if (!direxists(presetsDir)) {
+        mkpath(presetsDir);
+    }
+
+    std::string path = presetsDir + presetName + ".json";
+
+    if (!fileexists(path)) {
+        return false;
+    }
+
+    try {
+        std::filesystem::remove(path);
+        return true;
+    } catch (std::exception const& e) {
+        ERROR("Failed to delete preset: {}", e.what());
+        return false;
+    }
+}
+
+bool BetterSongSearch::FilterProfile::IsEqual(BetterSongSearch::FilterProfile const& other) const {
+    // clang-format off
+    return (
+        downloadType == other.downloadType &&
+        localScoreType == other.localScoreType &&
+        minLength == other.minLength &&
+        maxLength == other.maxLength &&
+        minNJS == other.minNJS &&
+        maxNJS == other.maxNJS &&
+        minNPS == other.minNPS &&
+        maxNPS == other.maxNPS &&
+        rankedType == other.rankedType &&
+        minStars == other.minStars &&
+        maxStars == other.maxStars &&
+        minUploadDate == other.minUploadDate &&
+        minRating == other.minRating &&
+        minVotes == other.minVotes &&
+        charFilter == other.charFilter &&
+        difficultyFilter == other.difficultyFilter &&
+        modRequirement == other.modRequirement &&
+        minUploadDateInMonths == other.minUploadDateInMonths &&
+        onlyCuratedMaps == other.onlyCuratedMaps &&
+        onlyVerifiedMappers == other.onlyVerifiedMappers &&
+        onlyV3Maps == other.onlyV3Maps &&
+        uploaders == other.uploaders &&
+        uploadersBlackList == other.uploadersBlackList &&
+        mapStyleString == other.mapStyleString &&
+        mapGenreString == other.mapGenreString &&
+        mapGenreExcludeString == other.mapGenreExcludeString
+    );
+    // clang-format on
+}
+
+void BetterSongSearch::FilterProfile::PrintToDebug() {
+    DEBUG("FilterProfile: ");
+    DEBUG("DownloadType: {}", downloadType);
+    DEBUG("LocalScoreType: {}", localScoreType);
+    DEBUG("RankedType: {}", rankedType);
+    DEBUG("DifficultyFilter: {}", difficultyFilter);
+    DEBUG("ModRequirement: {}", modRequirement);
+    DEBUG("MinLength: {}", minLength);
+    DEBUG("MaxLength: {}", maxLength);
+    DEBUG("MinNJS: {}", minNJS);
+    DEBUG("MaxNJS: {}", maxNJS);
+    DEBUG("MinNPS: {}", minNPS);
+    DEBUG("MaxNPS: {}", maxNPS);
+    DEBUG("MinStars: {}", minStars);
+    DEBUG("MaxStars: {}", maxStars);
+    DEBUG("MinUploadDate: {}", minUploadDate);
+    DEBUG("MinRating: {}", minRating);
+    DEBUG("MinVotes: {}", minVotes);
+    DEBUG("CharFilter: {}", charFilter);
+    DEBUG("MinUploadDateInMonths: {}", minUploadDateInMonths);
+    DEBUG("Uploaders: {}", join(uploaders, " "));
+    DEBUG("UploadersBlackList: {}", uploadersBlackList);
+    DEBUG("OnlyCuratedMaps: {}", onlyCuratedMaps);
+    DEBUG("OnlyVerifiedMappers: {}", onlyVerifiedMappers);
+    DEBUG("OnlyV3Maps: {}", onlyV3Maps);
+    DEBUG("MapStyleString: {}", mapStyleString);
+    DEBUG("MapGenreString: {}", mapGenreString);
+    DEBUG("MapGenreExcludeString: {}", mapGenreExcludeString);
+}
diff --git a/src/Formatters.cpp b/src/Formatters.cpp
new file mode 100644
index 0000000..b69bb58
--- /dev/null
+++ b/src/Formatters.cpp
@@ -0,0 +1,21 @@
+#include "Formatters.hpp"
+
+#include "logging.hpp"
+
+namespace BetterSongSearch::Formatters {
+    StringW FormatMapStyle(StringW value) {
+        DEBUG("Formatting map style");
+        // Uppercase the first letter
+        std::string result = (std::string) value;
+        if (result.size() == 0) {
+            return result;
+        }
+        result[0] = std::toupper(result[0]);
+        DEBUG("Formatted map style: {}", result);
+        return result;
+    }
+
+    std::string FormatSongGenre(StringW value) {
+        return (std::string) value;
+    }
+}  // namespace BetterSongSearch::Formatters
diff --git a/src/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.cpp b/src/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.cpp
index e4485ab..c97dc71 100644
--- a/src/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.cpp
+++ b/src/UI/FlowCoordinators/BetterSongSearchFlowCoordinator.cpp
@@ -4,17 +4,15 @@
 #include <bsml/shared/Helpers/getters.hpp>
 #include <UnityEngine/Resources.hpp>
 
-#include "System/Action.hpp"
-#include "HMUI/ViewController.hpp"
 #include "GlobalNamespace/SongPreviewPlayer.hpp"
-
+#include "HMUI/ViewController.hpp"
+#include "logging.hpp"
+#include "System/Action.hpp"
 
 using namespace GlobalNamespace;
 
 DEFINE_TYPE(BetterSongSearch::UI::FlowCoordinators, BetterSongSearchFlowCoordinator);
 
-
-
 void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Awake() {
     fcInstance = this;
     if (!SongListController) {
@@ -26,10 +24,17 @@ void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Aw
     if (!DownloadHistoryViewController) {
         DownloadHistoryViewController = BSML::Helpers::CreateViewController<ViewControllers::DownloadHistoryViewController*>();
     }
+
+    // Make sure the flow coordinator is not destroyed when changing scenes
+    UnityEngine::Object::DontDestroyOnLoad(this->get_gameObject());
 }
 
-void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::DidActivate(bool firstActivation, bool addedToHeirarchy, bool screenSystemEnabling) {
-    if (!firstActivation) return;
+void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::DidActivate(
+    bool firstActivation, bool addedToHeirarchy, bool screenSystemEnabling
+) {
+    if (!firstActivation) {
+        return;
+    }
 
     SetTitle("Better Song Search", HMUI::ViewController::AnimationType::In);
     showBackButton = true;
@@ -38,15 +43,17 @@ void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Di
 
 void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::BackButtonWasPressed(HMUI::ViewController* topViewController) {
     this->Close();
-    
 }
 
-//  std::function<void(int)> cancelConfirmCallback; 
-void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Close(bool immediately, bool downloadAbortConfim){
+//  std::function<void(int)> cancelConfirmCallback;
+void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Close(bool immediately, bool downloadAbortConfim) {
     // Do nothing if there's no parent flow coordinator (in multiplayer if you never called it it crashed)
 
-    if(downloadAbortConfim && ConfirmCancelOfPending([this, immediately](){this->Close(immediately, false);}))
-		return;
+    if (downloadAbortConfim && ConfirmCancelOfPending([this, immediately]() {
+            this->Close(immediately, false);
+        })) {
+        return;
+    }
 
     cancelConfirmCallback = nullptr;
 
@@ -62,9 +69,8 @@ void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Cl
         DownloadHistoryViewController->hasUnloadedDownloads = false;
     }
 
-
     // Hide all modals
-    for(auto modal: SongListController->GetComponentsInChildren<HMUI::ModalView*>()) {
+    for (auto modal : SongListController->GetComponentsInChildren<HMUI::ModalView*>()) {
         modal->Hide(false, nullptr);
     }
 
@@ -72,7 +78,8 @@ void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Cl
         this->____parentFlowCoordinator->DismissFlowCoordinator(this, HMUI::ViewController::AnimationDirection::Horizontal, nullptr, immediately);
     }
 };
-bool BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::ConfirmCancelOfPending(std::function<void()> callback){
+
+bool BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::ConfirmCancelOfPending(std::function<void()> callback) {
     if (DownloadHistoryViewController->HasPendingDownloads()) {
         cancelConfirmCallback = callback;
         SongListController->ShowCloseConfirmation();
@@ -82,13 +89,13 @@ bool BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Co
     }
 };
 
-void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::ConfirmCancelCallback(bool doCancel){
-    if(doCancel) {
+void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::ConfirmCancelCallback(bool doCancel) {
+    if (doCancel) {
         // Fail all dls
-        for (auto entry : DownloadHistoryViewController->downloadEntryList)
-        {
-            if (entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(DownloadHistoryEntry::DownloadStatus::Downloading | DownloadHistoryEntry::DownloadStatus::Queued)))
-            {
+        for (auto entry : DownloadHistoryViewController->downloadEntryList) {
+            if (entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(
+                    DownloadHistoryEntry::DownloadStatus::Downloading | DownloadHistoryEntry::DownloadStatus::Queued
+                ))) {
                 entry->retries = 69;
                 entry->status = DownloadHistoryEntry::DownloadStatus::Failed;
             }
@@ -99,4 +106,4 @@ void BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator::Co
     }
 
     cancelConfirmCallback = nullptr;
-}
\ No newline at end of file
+}
diff --git a/src/UI/Manager.cpp b/src/UI/Manager.cpp
index ecec835..a8da6ba 100644
--- a/src/UI/Manager.cpp
+++ b/src/UI/Manager.cpp
@@ -1,26 +1,27 @@
 #include "UI/Manager.hpp"
 
 #include <bsml/shared/Helpers/getters.hpp>
+
+#include "DataHolder.hpp"
+#include "GlobalNamespace/MenuTransitionsHelper.hpp"
+#include "HMUI/NoTransitionsButton.hpp"
 #include "logging.hpp"
-#include "Util/Debug.hpp"
-#include "sys/types.h"
 #include "sys/sysinfo.h"
-#include "GlobalNamespace/MenuTransitionsHelper.hpp"
+#include "sys/types.h"
 #include "System/GC.hpp"
 #include "UnityEngine/Profiling/Profiler.hpp"
 #include "UnityEngine/Resources.hpp"
-#include "HMUI/NoTransitionsButton.hpp"
-
+#include "Util/Debug.hpp"
 
 using namespace BetterSongSearch::UI;
 using namespace BetterSongSearch::Util;
 using namespace GlobalNamespace;
 
 #define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
-  
-void BetterSongSearch::UI::Manager::Init(){
+
+void BetterSongSearch::UI::Manager::Init() {
     // Register the menu button
-    BSML::Register::RegisterMenuButton("Better Song Search", "Search songs, but better", [this](){
+    BSML::Register::RegisterMenuButton("Better Song Search", "Search songs, but better", [this]() {
         DEBUG("MenuButtonClick");
         ShowFlow(false);
     });
@@ -39,39 +40,33 @@ custom_types::Helpers::Coroutine BetterSongSearch::UI::Manager::Debug() {
     co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(1.0f));
 
     // Wait for songs to load
-    while (!DataHolder::loaded) {
+    while (!dataHolder.loaded) {
         co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(0.2f));
     }
 
     co_return;
 
-    while(true) {
-        
-       
+    while (true) {
         // Tests for the fcinstance
         if (fcInstance) {
-        //     // Select random song go into the play menu and go back
-        //     {
-        //         auto* songlist = fcInstance->SongListController;
-        //         co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(0.5f));
-        //         songlist->SelectRandom();
-        //         if (songlist->currentSong) {
-        //             co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(1.0f));
-
-        //             if (songlist->playButton->get_gameObject()->get_active()) {
-        //                 songlist->PlaySong(songlist->currentSong);
-        //                 co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(2.5f));
-        //                 // Press back button
-        //                 UnityEngine::GameObject::Find("BackButton")->GetComponent<HMUI::NoTransitionsButton*>()->Press();
-        //             }
-                    
-                    
-
-                   
-                    
-        //             ++iterations_count;
-        //         }
-        //     }
+            //     // Select random song go into the play menu and go back
+            //     {
+            //         auto* songlist = fcInstance->SongListController;
+            //         co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(0.5f));
+            //         songlist->SelectRandom();
+            //         if (songlist->currentSong) {
+            //             co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(1.0f));
+
+            //             if (songlist->playButton->get_gameObject()->get_active()) {
+            //                 songlist->PlaySong(songlist->currentSong);
+            //                 co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(2.5f));
+            //                 // Press back button
+            //                 UnityEngine::GameObject::Find("BackButton")->GetComponent<HMUI::NoTransitionsButton*>()->Press();
+            //             }
+
+            //             ++iterations_count;
+            //         }
+            //     }
 
             // Pick random song, show details, close details
             {
@@ -86,19 +81,11 @@ custom_types::Helpers::Coroutine BetterSongSearch::UI::Manager::Debug() {
                     ++iterations_count;
                 }
             }
-
-
-
-
         }
-        
-        
+
         // Debug restart of the game
-        // {   
+        // {
         //     DEBUG("Open BSS");
-            
-
-            
 
         //     DEBUG("Press back button");
         //     // Press back button
@@ -106,7 +93,6 @@ custom_types::Helpers::Coroutine BetterSongSearch::UI::Manager::Debug() {
 
         //     co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(3.0f));
 
-
         //     DEBUG("Reload the game manually");
         //     // Reload the game manually
         //     UnityEngine::Resources::FindObjectsOfTypeAll<MenuTransitionsHelper*>()[0]->RestartGame(nullptr);
@@ -125,25 +111,38 @@ custom_types::Helpers::Coroutine BetterSongSearch::UI::Manager::Debug() {
         //         // Press back button
         //         UnityEngine::GameObject::Find("BackButton")->GetComponent<HMUI::NoTransitionsButton*>()->Press();
         //         // manager.ShowFlow(true);
-                
+
         //         ++iterations_count;
         //     }
         // }
-        
 
         // Collect garbage
         System::GC::Collect();
 
         int64_t mem = UnityEngine::Profiling::Profiler::GetMonoUsedSizeLong();
-        DEBUG("\nIter {}\nUsed {}\nChan {}\nInit: {}", iterations_count,  pretty_bytes(mem), pretty_bytes(mem - lastused), pretty_bytes(lastused - initialmemusage));
+        DEBUG(
+            "\nIter {}\nUsed {}\nChan {}\nInit: {}",
+            iterations_count,
+            pretty_bytes(mem),
+            pretty_bytes(mem - lastused),
+            pretty_bytes(lastused - initialmemusage)
+        );
         lastused = mem;
-
-
-        
     }
     co_yield nullptr;
 }
 
+void BetterSongSearch::UI::Manager::DestroyFlow() {
+    if (flow) {
+        DEBUG("Destroying BSS flowController");
+        auto flowGO = flow->get_gameObject();
+        if (flowGO) {
+            UnityEngine::Object::DestroyImmediate(flowGO);
+        }
+    } else {
+        WARNING("Destroy flow called when the controller didn't exist");
+    }
+}
 
 void BetterSongSearch::UI::Manager::ShowFlow(bool immediately) {
     if (!flow) {
@@ -161,11 +160,11 @@ void BetterSongSearch::UI::Manager::GoToSongSelect() {
     if (!songSelectButton) {
         return;
     }
-    songSelectButton->GetComponent<HMUI::NoTransitionsButton *>()->Press();
+    songSelectButton->GetComponent<HMUI::NoTransitionsButton*>()->Press();
 }
 
 void BetterSongSearch::UI::Manager::Close(bool immediately, bool downloadAbortConfim) {
     if (flow) {
         flow->Close(immediately, downloadAbortConfim);
     }
-};
\ No newline at end of file
+};
diff --git a/src/UI/Modals/GenrePicker.cpp b/src/UI/Modals/GenrePicker.cpp
new file mode 100644
index 0000000..6ff9fad
--- /dev/null
+++ b/src/UI/Modals/GenrePicker.cpp
@@ -0,0 +1,187 @@
+#include "UI/Modals/GenrePicker.hpp"
+
+#include "assets.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "DataHolder.hpp"
+#include "FilterOptions.hpp"
+#include "GlobalNamespace/LevelCollectionTableView.hpp"
+#include "HMUI/TableView.hpp"
+#include "logging.hpp"
+#include "System/Tuple_2.hpp"
+#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
+#include "UI/Modals/GenrePickerCell.hpp"
+#include "UnityEngine/Resources.hpp"
+#include "Util/TextUtil.hpp"
+
+using namespace BetterSongSearch::UI;
+using namespace BetterSongSearch::Util;
+#define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
+
+DEFINE_TYPE(BetterSongSearch::UI::Modals, GenrePicker);
+
+void Modals::GenrePicker::OnEnable() {
+}
+
+void Modals::GenrePicker::PostParse() {
+    // BSML has a bug that stops getting the correct platform helper and on game reset it dies and the scrollhelper stays invalid and scroll doesn't
+    // work
+    auto platformHelper = UnityEngine::Resources::FindObjectsOfTypeAll<GlobalNamespace::LevelCollectionTableView*>()
+                              ->First()
+                              ->GetComponentInChildren<HMUI::ScrollView*>()
+                              ->____platformHelper;
+    if (platformHelper == nullptr) {
+    } else {
+        for (auto x : this->GetComponentsInChildren<HMUI::ScrollView*>()) {
+            x->____platformHelper = platformHelper;
+        }
+    }
+}
+
+void Modals::GenrePicker::CloseModal() {
+    this->genrePickerModal->Hide();
+}
+
+void Modals::GenrePicker::ctor() {
+    INVOKE_CTOR();
+    this->initialized = false;
+
+    // Subscribe to events
+    dataHolder.loadingFinished += {&Modals::GenrePicker::RefreshGenreList, this};
+}
+
+void Modals::GenrePicker::OnDestroy() {
+    // Unsub from events
+    dataHolder.loadingFinished -= {&Modals::GenrePicker::RefreshGenreList, this};
+}
+
+void Modals::GenrePicker::RefreshGenreList() {
+    if (!genresTableData) {
+        return;
+    }
+    auto table = genresTableData->tableView;
+    if (!table) {
+        return;
+    }
+
+    DEBUG("Refreshing genre list");
+
+    DEBUG("Genre list size: {}", dataHolder.tags.size());
+
+    if (dataHolder.tags.size() == 0) {
+        return;
+    }
+
+    // Recalculate preprocessed values
+    dataHolder.filterOptions.RecalculatePreprocessedValues();
+
+    std::vector<GenreCellState> tempGenres;
+    for (auto& genre : dataHolder.tags) {
+        GenreCellStatus state = GenreCellStatus::None;
+        auto mask = genre.mask;
+
+        auto isExcluded = dataHolder.filterOptions._mapGenreExcludeBitfield & mask;
+        auto isIncluded = dataHolder.filterOptions._mapGenreBitfield & mask;
+
+        if (isExcluded) {
+            state = GenreCellStatus::Exclude;
+        }
+        if (isIncluded) {
+            state = GenreCellStatus::Include;
+        }
+
+        tempGenres.push_back({genre.tag, mask, state, genre.songCount});
+    }
+
+    DEBUG("Genre list size: {}", tempGenres.size());
+
+    // Swap the vectors
+    tempGenres.swap(genres);
+
+    DEBUG("Genre list refreshed, {} genres", genres.size());
+
+    table->SetDataSource(reinterpret_cast<HMUI::TableView::IDataSource*>(this), false);
+    table->ReloadData();
+}
+
+void Modals::GenrePicker::OpenModal() {
+    if (!initialized) {
+        BSML::parse_and_construct(Assets::GenrePicker_bsml, this->get_transform(), this);
+        initialized = true;
+    }
+
+    INFO("Opening genre picker modal");
+    this->genrePickerModal->Show();
+
+    if (!dataHolder.songDetails->tags.get_isDataAvailable()) {
+        return;
+    }
+
+    auto fv = fcInstance->FilterViewController;
+    if (!fv) {
+        return;
+    }
+
+    dataHolder.PreprocessTags();
+    RefreshGenreList();
+}
+
+void Modals::GenrePicker::ClearGenre() {
+    dataHolder.filterOptions.mapGenreString = "";
+    dataHolder.filterOptions.mapGenreExcludeString = "";
+    getPluginConfig().MapGenreExcludeString.SetValue("");
+    getPluginConfig().MapGenreString.SetValue("");
+
+    // Trigger refresh of songs
+    auto slController = fcInstance->SongListController;
+    slController->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
+
+    // Update filter settings
+    fcInstance->FilterViewController->UpdateLocalState();
+    fcInstance->FilterViewController->ForceRefreshUI();
+
+    this->genrePickerModal->Hide();
+}
+
+// Table stuff
+HMUI::TableCell* Modals::GenrePicker::CellForIdx(HMUI::TableView* tableView, int idx) {
+    return Modals::GenrePickerCell::GetCell(tableView)->PopulateWithGenre(&genres[idx]);
+}
+
+float Modals::GenrePicker::CellSize() {
+    return 5.00f;
+}
+
+int Modals::GenrePicker::NumberOfCells() {
+    return genres.size();
+}
+
+void Modals::GenrePicker::SelectGenre() {
+    std::vector<std::string> selectedGenres;
+    std::vector<std::string> excludedGenres;
+
+    for (auto& g : genres) {
+        if (g.status == GenreCellStatus::Include) {
+            selectedGenres.push_back(g.tag);
+        } else if (g.status == GenreCellStatus::Exclude) {
+            excludedGenres.push_back(g.tag);
+        }
+    }
+
+    // Trigger refresh of songs
+    std::string includeString = join(selectedGenres, " ");
+    std::string excludeString = join(excludedGenres, " ");
+
+    dataHolder.filterOptions.mapGenreString = includeString;
+    dataHolder.filterOptions.mapGenreExcludeString = excludeString;
+    getPluginConfig().MapGenreString.SetValue(includeString);
+    getPluginConfig().MapGenreExcludeString.SetValue(excludeString);
+
+    auto slController = fcInstance->SongListController;
+    slController->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
+
+    // Update filter settings
+    fcInstance->FilterViewController->UpdateLocalState();
+    fcInstance->FilterViewController->ForceRefreshUI();
+
+    this->genrePickerModal->Hide();
+}
diff --git a/src/UI/Modals/GenrePickerCell.cpp b/src/UI/Modals/GenrePickerCell.cpp
new file mode 100644
index 0000000..8ddc189
--- /dev/null
+++ b/src/UI/Modals/GenrePickerCell.cpp
@@ -0,0 +1,76 @@
+#include "UI/Modals/GenrePickerCell.hpp"
+
+DEFINE_TYPE(BetterSongSearch::UI::Modals, GenrePickerCell);
+
+StringW const GenrePickerCellReuseIdentifier = "REUSEGenreTableCell";
+
+namespace BetterSongSearch::UI::Modals {
+    void GenrePickerCell::Refresh() {
+        if (genre == nullptr) {
+            return;
+        }
+
+        includeButton->set_fontStyle(genre->status == GenreCellStatus::Exclude ? TMPro::FontStyles::Strikethrough : TMPro::FontStyles::Normal);
+
+        includeButton->set_color(UnityEngine::Color(
+            genre->status == GenreCellStatus::Exclude ? 1.0f : 0.8f,
+            genre->status == GenreCellStatus::Include ? 1.0f : 0.7f,
+            0.8f,
+            get_highlighted() ? 1.0f : 0.8f
+        ));
+
+        excludeButton->get_gameObject()->SetActive(highlighted && genre->status != GenreCellStatus::Exclude);
+    }
+
+    void GenrePickerCell::SelectionDidChange(HMUI::SelectableCell::TransitionType transitionType) {
+        Refresh();
+    }
+
+    void GenrePickerCell::HighlightDidChange(HMUI::SelectableCell::TransitionType transitionType) {
+        Refresh();
+    }
+
+    void GenrePickerCell::WasPreparedForReuse() {
+        includeButton->set_text("");
+        genre = nullptr;
+    }
+
+    BetterSongSearch::UI::Modals::GenrePickerCell* GenrePickerCell::PopulateWithGenre(BetterSongSearch::UI::Modals::GenreCellState* state) {
+        this->genre = state;
+        includeButton->set_text(fmt::format("{} ({})", state->tag, state->songCount));
+        Refresh();
+
+        return this;
+    }
+
+    BetterSongSearch::UI::Modals::GenrePickerCell* GenrePickerCell::GetCell(HMUI::TableView* tableView) {
+        auto tableCell = tableView->DequeueReusableCellForIdentifier(GenrePickerCellReuseIdentifier);
+        if (!tableCell) {
+            tableCell = UnityEngine::GameObject::New_ctor("GenrePickerCell")->AddComponent<GenrePickerCell*>();
+            tableCell->set_interactable(true);
+            tableCell->set_reuseIdentifier(GenrePickerCellReuseIdentifier);
+            BSML::parse_and_construct(Assets::GenrePickerCell_bsml, tableCell->get_transform(), tableCell);
+
+            // Weird hack cause HMUI touchable is not there for some reason, thanks RedBrumbler
+            tableCell->get_gameObject()->AddComponent<HMUI::Touchable*>();
+        }
+
+        return tableCell.cast<GenrePickerCell>();
+    }
+
+    void GenrePickerCell::IncludeGenre() {
+        if (genre == nullptr) {
+            return;
+        }
+        genre->status = genre->status == GenreCellStatus::Include ? GenreCellStatus::None : GenreCellStatus::Include;
+        Refresh();
+    }
+
+    void GenrePickerCell::ExcludeGenre() {
+        if (genre == nullptr) {
+            return;
+        }
+        genre->status = GenreCellStatus::Exclude;
+        Refresh();
+    }
+}  // namespace BetterSongSearch::UI::Modals
diff --git a/src/UI/Modals/MultiDL.cpp b/src/UI/Modals/MultiDL.cpp
index d858d4a..9c39450 100644
--- a/src/UI/Modals/MultiDL.cpp
+++ b/src/UI/Modals/MultiDL.cpp
@@ -1,28 +1,24 @@
 #include "UI/Modals/MultiDL.hpp"
-#include "main.hpp"
 
-#include "HMUI/TableView.hpp"
+#include "assets.hpp"
 #include "bsml/shared/BSML.hpp"
+#include "DataHolder.hpp"
+#include "logging.hpp"
 #include "songcore/shared/SongCore.hpp"
-#include "beatsaverplusplus/shared/BeatSaver.hpp"
 #include "System/Tuple_2.hpp"
-#include "assets.hpp"
-#include "Util/CurrentTimeMs.hpp"
-#include "UI/ViewControllers/DownloadListTableData.hpp"
 #include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
-#include "logging.hpp"
+#include "Util/CurrentTimeMs.hpp"
+
 using namespace BetterSongSearch::UI;
 using namespace BetterSongSearch::Util;
 #define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
 
 DEFINE_TYPE(BetterSongSearch::UI::Modals, MultiDL);
 
-void Modals::MultiDL::OnEnable()
-{
+void Modals::MultiDL::OnEnable() {
 }
 
-void Modals::MultiDL::StartMultiDownload()
-{   
+void Modals::MultiDL::StartMultiDownload() {
     DEBUG("Downloading {} songs", this->songsToDownload);
 
     auto songController = fcInstance->SongListController;
@@ -31,37 +27,37 @@ void Modals::MultiDL::StartMultiDownload()
     auto range = table->GetVisibleCellsIdRange();
 
     int downloaded = 0;
-    for (int i = range->get_Item1(); i < DataHolder::sortedSongList.size(); i++)
-    {   
-        auto song = DataHolder::sortedSongList[i];
+    for (int i = range->get_Item1(); i < dataHolder.displayedSongList.size(); i++) {
+        auto song = dataHolder.displayedSongList[i];
         // Skip if can't dl or already downloading
-        if (dlController->CheckIsDownloaded(std::string(song->hash())) || !dlController->CheckIsDownloadable(std::string(song->hash()))) 
+        if (dlController->CheckIsDownloaded(std::string(song->hash())) || !dlController->CheckIsDownloadable(std::string(song->hash()))) {
             continue;
+        }
 
-        if (!dlController->TryAddDownload(song, true))
+        if (!dlController->TryAddDownload(song, true)) {
             continue;
+        }
 
-        if (++downloaded >= this->songsToDownload)
+        if (++downloaded >= this->songsToDownload) {
             break;
+        }
     }
     dlController->RefreshTable(true);
     this->CloseModal();
     return;
 }
-void Modals::MultiDL::CloseModal()
-{
+
+void Modals::MultiDL::CloseModal() {
     this->modal->Hide();
 }
 
-void Modals::MultiDL::ctor()
-{
+void Modals::MultiDL::ctor() {
     INVOKE_CTOR();
     this->initialized = false;
     this->songsToDownload = 5;
 }
 
-void Modals::MultiDL::OpenModal()
-{
+void Modals::MultiDL::OpenModal() {
     if (!initialized) {
         BSML::parse_and_construct(Assets::MultiDl_bsml, this->get_transform(), this);
         initialized = true;
diff --git a/src/UI/Modals/Presets.cpp b/src/UI/Modals/Presets.cpp
new file mode 100644
index 0000000..949a312
--- /dev/null
+++ b/src/UI/Modals/Presets.cpp
@@ -0,0 +1,178 @@
+#include "UI/Modals/Presets.hpp"
+
+#include "assets.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "DataHolder.hpp"
+#include "FilterOptions.hpp"
+#include "GlobalNamespace/LevelCollectionTableView.hpp"
+#include "HMUI/TableView.hpp"
+#include "logging.hpp"
+#include "System/Tuple_2.hpp"
+#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
+#include "UI/Modals/PresetsTable.hpp"
+#include "UnityEngine/Resources.hpp"
+
+using namespace BetterSongSearch::UI;
+using namespace BetterSongSearch::Util;
+#define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
+
+DEFINE_TYPE(BetterSongSearch::UI::Modals, Presets);
+
+void Modals::Presets::OnEnable() {
+}
+
+void Modals::Presets::PostParse() {
+    // BSML has a bug that stops getting the correct platform helper and on game reset it dies and the scrollhelper stays invalid and scroll doesn't
+    // work
+    auto platformHelper = UnityEngine::Resources::FindObjectsOfTypeAll<GlobalNamespace::LevelCollectionTableView*>()
+                              ->First()
+                              ->GetComponentInChildren<HMUI::ScrollView*>()
+                              ->____platformHelper;
+    if (platformHelper == nullptr) {
+    } else {
+        for (auto x : this->GetComponentsInChildren<HMUI::ScrollView*>()) {
+            x->____platformHelper = platformHelper;
+        }
+    }
+
+    if (this->presetListTableData) {
+        INFO("Table exists");
+        this->presetListTableData->tableView->SetDataSource(reinterpret_cast<HMUI::TableView::IDataSource*>(this), false);
+    }
+
+    // BSML / HMUI my beloved (this currently doesn't work on quest since it was stripped from the build, bsml needs a fix)
+    newPresetNameSetting->modalKeyboard->modalView->_animateParentCanvas = false;
+}
+
+void Modals::Presets::CloseModal() {
+    this->presetsModal->Hide();
+}
+
+void Modals::Presets::ctor() {
+    INVOKE_CTOR();
+    this->initialized = false;
+}
+
+void Modals::Presets::OpenModal() {
+    if (!initialized) {
+        BSML::parse_and_construct(Assets::Presets_bsml, this->get_transform(), this);
+        initialized = true;
+    }
+    RefreshPresetsList();
+    this->presetsModal->Show();
+}
+
+void Modals::Presets::OpenSavePresetModal() {
+    if (!initialized) {
+        BSML::parse_and_construct(Assets::Presets_bsml, this->get_transform(), this);
+        initialized = true;
+    }
+    this->savePresetModal->Show();
+}
+
+void Modals::Presets::CloseSavePresetModal() {
+    this->savePresetModal->Hide();
+}
+
+// Table stuff
+HMUI::TableCell* Modals::Presets::CellForIdx(HMUI::TableView* tableView, int idx) {
+    return Modals::PresetsTableCell::GetCell(tableView)->PopulateWithPresetName(presets[idx]);
+}
+
+float Modals::Presets::CellSize() {
+    return 7.0f;
+}
+
+int Modals::Presets::NumberOfCells() {
+    return presets.size();
+}
+
+void Modals::Presets::AddPreset() {
+    try {
+        std::string newPresetName = newPresetNameSetting->get_text();
+        if (newPresetName == "") {
+            return;
+        }
+        dataHolder.filterOptions.SaveToPreset(newPresetName);
+
+        presets.push_back(newPresetName);
+
+    } catch (std::exception& e) {
+        ERROR("Failed to save preset: {}", e.what());
+    }
+
+    RefreshPresetsList();
+    CloseSavePresetModal();
+}
+
+void Modals::Presets::LoadPreset() {
+    if (selectedPreset == "") {
+        return;
+    }
+
+    auto presetOptional = dataHolder.filterOptions.LoadFromPreset(selectedPreset);
+
+    if (!presetOptional.has_value()) {
+        return;
+    }
+
+    dataHolder.filterOptions = presetOptional.value();
+    dataHolder.filterOptions.SaveToConfig();
+
+    // Update filter settings
+    fcInstance->FilterViewController->UpdateLocalState();
+    fcInstance->FilterViewController->ForceRefreshUI();
+
+    DEBUG("Filters changed");
+
+    // Update filter options state
+    auto slController = fcInstance->SongListController;
+    slController->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
+
+    CloseModal();
+}
+
+void Modals::Presets::DeletePreset() {
+    if (selectedPreset == "") {
+        return;
+    }
+    dataHolder.filterOptions.DeletePreset(selectedPreset);
+    RefreshPresetsList();
+
+    if (presetListTableData && presetListTableData->tableView) {
+        presetListTableData->tableView->ClearSelection();
+    }
+    selectedPreset = "";
+}
+
+void Modals::Presets::PresetSelected(UnityW<HMUI::TableView> table, int id) {
+    if (id < 0 || id >= presets.size()) {
+        return;
+    }
+
+    loadButton->set_interactable(true);
+    deleteButton->set_interactable(true);
+
+    selectedPreset = presets[id];
+
+    newPresetNameSetting->set_text(selectedPreset);
+}
+
+void Modals::Presets::RefreshPresetsList() {
+    auto presetList = FilterProfile::GetPresetList();
+    presets.clear();
+
+    for (auto& preset : presetList) {
+        presets.push_back(preset);
+    }
+
+    if (presetListTableData && presetListTableData->tableView) {
+        presetListTableData->tableView->ReloadData();
+    }
+
+    loadButton->set_interactable(false);
+    deleteButton->set_interactable(false);
+
+    newPresetNameSetting->set_text("");
+    selectedPreset = "";
+}
diff --git a/src/UI/Modals/PresetsTable.cpp b/src/UI/Modals/PresetsTable.cpp
new file mode 100644
index 0000000..3e2a7cf
--- /dev/null
+++ b/src/UI/Modals/PresetsTable.cpp
@@ -0,0 +1,54 @@
+#include "UI/Modals/PresetsTable.hpp"
+
+#include "sombrero/shared/FastColor.hpp"
+
+DEFINE_TYPE(BetterSongSearch::UI::Modals, PresetsTableCell);
+
+StringW const PresetsTableCellReuseIdentifier = "REUSEPresetsTableCell";
+
+namespace BetterSongSearch::UI::Modals {
+    void PresetsTableCell::RefreshBgState() {
+        // clang-format off
+        presetNameLabel->set_color(
+            Sombrero::FastColor(
+                selected? 0.0f : 1.0f,
+                selected? 0.5f : 1.0f,
+                selected? 0.5f : 1.0f,
+                highlighted? 0.9f : 0.6f
+            )
+        );
+        // clang-format on
+    }
+
+    void PresetsTableCell::SelectionDidChange(HMUI::SelectableCell::TransitionType transitionType) {
+        RefreshBgState();
+    }
+
+    void PresetsTableCell::HighlightDidChange(HMUI::SelectableCell::TransitionType transitionType) {
+        RefreshBgState();
+    }
+
+    void PresetsTableCell::WasPreparedForReuse() {
+        presetNameLabel->set_text("");
+    }
+
+    PresetsTableCell* PresetsTableCell::PopulateWithPresetName(StringW presetName) {
+        presetNameLabel->set_text(presetName);
+        return this;
+    }
+
+    PresetsTableCell* PresetsTableCell::GetCell(HMUI::TableView* tableView) {
+        auto tableCell = tableView->DequeueReusableCellForIdentifier(PresetsTableCellReuseIdentifier);
+        if (!tableCell) {
+            tableCell = UnityEngine::GameObject::New_ctor("PresetsTableCell")->AddComponent<PresetsTableCell*>();
+            tableCell->set_interactable(true);
+            tableCell->set_reuseIdentifier(PresetsTableCellReuseIdentifier);
+            BSML::parse_and_construct(Assets::PresetsListCell_bsml, tableCell->get_transform(), tableCell);
+
+            // Weird hack cause HMUI touchable is not there for some reason, thanks RedBrumbler
+            tableCell->get_gameObject()->AddComponent<HMUI::Touchable*>();
+        }
+
+        return tableCell.cast<PresetsTableCell>();
+    }
+}  // namespace BetterSongSearch::UI::Modals
diff --git a/src/UI/Modals/Settings.cpp b/src/UI/Modals/Settings.cpp
index f17a4de..9ff3949 100644
--- a/src/UI/Modals/Settings.cpp
+++ b/src/UI/Modals/Settings.cpp
@@ -1,15 +1,12 @@
 #include "UI/Modals/Settings.hpp"
-#include "main.hpp"
-#include "PluginConfig.hpp"
-#include "HMUI/TableView.hpp"
-#include "bsml/shared/BSML.hpp"
-#include "songcore/shared/SongCore.hpp"
-#include "beatsaverplusplus/shared/BeatSaver.hpp"
 
 #include "assets.hpp"
-#include "Util/CurrentTimeMs.hpp"
-#include "UI/ViewControllers/DownloadListTableData.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "DataHolder.hpp"
+#include "PluginConfig.hpp"
+#include "songcore/shared/SongCore.hpp"
 #include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
+#include "Util/CurrentTimeMs.hpp"
 
 using namespace BetterSongSearch::UI;
 using namespace BetterSongSearch::Util;
@@ -17,24 +14,19 @@ using namespace BetterSongSearch::Util;
 
 DEFINE_TYPE(BetterSongSearch::UI::Modals, Settings);
 
-void Modals::Settings::OnEnable()
-{
+void Modals::Settings::OnEnable() {
 }
 
-
-void Modals::Settings::CloseModal()
-{
+void Modals::Settings::CloseModal() {
     this->settingsModal->Hide();
 }
 
-void Modals::Settings::ctor()
-{
+void Modals::Settings::ctor() {
     INVOKE_CTOR();
     this->initialized = false;
 }
 
-void Modals::Settings::OpenModal()
-{
+void Modals::Settings::OpenModal() {
     if (!initialized) {
         BSML::parse_and_construct(Assets::Settings_bsml, this->get_transform(), this);
         initialized = true;
@@ -42,18 +34,18 @@ void Modals::Settings::OpenModal()
     this->settingsModal->Show();
 }
 
-
-bool Modals::Settings::get_returnToBssFromSolo() {    
+bool Modals::Settings::get_returnToBssFromSolo() {
     return getPluginConfig().ReturnToBSS.GetValue();
 }
+
 void Modals::Settings::set_returnToBssFromSolo(bool value) {
     getPluginConfig().ReturnToBSS.SetValue(value);
 }
 
-
 bool Modals::Settings::get_loadSongPreviews() {
-   return getPluginConfig().LoadSongPreviews.GetValue();
+    return getPluginConfig().LoadSongPreviews.GetValue();
 }
+
 void Modals::Settings::set_loadSongPreviews(bool value) {
     getPluginConfig().LoadSongPreviews.SetValue(value);
 }
@@ -61,6 +53,7 @@ void Modals::Settings::set_loadSongPreviews(bool value) {
 bool Modals::Settings::get_smallerFontSize() {
     return getPluginConfig().SmallerFontSize.GetValue();
 }
+
 void Modals::Settings::set_smallerFontSize(bool value) {
     getPluginConfig().SmallerFontSize.SetValue(value);
     fcInstance->SongListController->songListTable()->ReloadData();
@@ -69,21 +62,21 @@ void Modals::Settings::set_smallerFontSize(bool value) {
 StringW Modals::Settings::get_preferredLeaderboard() {
     // Preferred Leaderboard
     std::string preferredLeaderboard = getPluginConfig().PreferredLeaderboard.GetValue();
-    if (leaderBoardMap.contains(preferredLeaderboard)) {
+    if (LEADERBOARD_MAP.contains(preferredLeaderboard)) {
         return preferredLeaderboard;
     } else {
-        DataHolder::preferredLeaderboard = PreferredLeaderBoard::ScoreSaber;
+        dataHolder.preferredLeaderboard = FilterTypes::PreferredLeaderBoard::ScoreSaber;
         getPluginConfig().PreferredLeaderboard.SetValue("Scoresaber");
         return "Scoresaber";
     }
 }
 
 void Modals::Settings::set_preferredLeaderboard(StringW value) {
-    if (leaderBoardMap.contains(value)) {
-        DataHolder::preferredLeaderboard = leaderBoardMap.at(value);
+    if (LEADERBOARD_MAP.contains(value)) {
+        dataHolder.preferredLeaderboard = LEADERBOARD_MAP.at(value);
         getPluginConfig().PreferredLeaderboard.SetValue(value);
         auto controller = fcInstance->SongListController;
-        controller->filterChanged = true;
-        controller->SortAndFilterSongs(controller->sort, controller->search, true);
+        dataHolder.forceReload = true;
+        controller->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
     }
 }
diff --git a/src/UI/Modals/UploadDetails.cpp b/src/UI/Modals/UploadDetails.cpp
index cd7932b..e20471b 100644
--- a/src/UI/Modals/UploadDetails.cpp
+++ b/src/UI/Modals/UploadDetails.cpp
@@ -1,58 +1,81 @@
 #include "UI/Modals/UploadDetails.hpp"
 
-#include <bsml/shared/BSML/MainThreadScheduler.hpp>
-
-#include "main.hpp"
-#include "PluginConfig.hpp"
-#include "HMUI/TableView.hpp"
+#include "assets.hpp"
+#include "BeatSaverRegionManager.hpp"
 #include "bsml/shared/BSML.hpp"
+#include "bsml/shared/BSML/MainThreadScheduler.hpp"
+#include "PluginConfig.hpp"
 #include "songcore/shared/SongCore.hpp"
-#include "beatsaverplusplus/shared/BeatSaver.hpp"
-#include "BeatSaverRegionManager.hpp"
-#include "assets.hpp"
-#include "Util/CurrentTimeMs.hpp"
-#include "UI/ViewControllers/DownloadListTableData.hpp"
 #include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
+#include "UnityEngine/GUIUtility.hpp"
+#include "Util/CurrentTimeMs.hpp"
 
 using namespace BetterSongSearch::UI;
 using namespace BetterSongSearch::Util;
 #define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
 
-const std::vector<std::string> CHAR_GROUPING = {"Custom", "Standard", "OneSaber", "NoArrows", "NinetyDegree", "ThreeSixtyDegree", "LightShow", "Lawless"};
-
+const std::vector<std::string> CHAR_GROUPING = {
+    "Custom", "Standard", "OneSaber", "NoArrows", "NinetyDegree", "ThreeSixtyDegree", "LightShow", "Lawless"
+};
 
 DEFINE_TYPE(BetterSongSearch::UI::Modals, UploadDetails);
 
-//name and count
-std::unordered_map<std::string, int> GroupCharByDiff(const SongDetailsCache::Song * song) {
+// name and count
+std::unordered_map<std::string, int> GroupCharByDiff(SongDetailsCache::Song const* song) {
     std::unordered_map<std::string, int> groupedChars;
-    for(const auto& diff : *song) {
-        auto key = CHAR_GROUPING[(int)diff.characteristic];
-        if(!groupedChars.contains(key))
+    for (auto const& diff : *song) {
+        auto key = CHAR_GROUPING[(int) diff.characteristic];
+        if (!groupedChars.contains(key)) {
             groupedChars.emplace(key, 1);
-        else groupedChars[key] += 1;
+        } else {
+            groupedChars[key] += 1;
+        }
     }
     return groupedChars;
 }
 
-void Modals::UploadDetails::OnEnable()
-{
+void Modals::UploadDetails::OnEnable() {
 }
 
-
-void Modals::UploadDetails::CloseModal()
-{
+void Modals::UploadDetails::CloseModal() {
     this->rootModal->Hide();
 }
 
-void Modals::UploadDetails::ctor()
-{
+void Modals::UploadDetails::OpenBeatSaver() {
+    try {
+        static auto UnityEngine_Application_OpenURL = il2cpp_utils::resolve_icall<void, StringW>("UnityEngine.Application::OpenURL");
+        UnityEngine_Application_OpenURL(StringW("https://beatsaver.com/maps/" + selectedSongKey->get_text()));
+    } catch (...) {
+        ERROR("Failed to OpenBeatSaver");
+    }
+}
+
+void Modals::UploadDetails::OpenMapPreview() {
+    try {
+        static auto UnityEngine_Application_OpenURL = il2cpp_utils::resolve_icall<void, StringW>("UnityEngine.Application::OpenURL");
+        UnityEngine_Application_OpenURL(StringW("https://allpoland.github.io/ArcViewer/?id=" + selectedSongKey->get_text()));
+    } catch (...) {
+        ERROR("Failed to open map preview");
+    }
+}
+
+void Modals::UploadDetails::CopyBSR() {
+    try {
+        auto bsr = selectedSongKey->get_text();
+        static auto UnityEngine_GUIUtility_set_systemCopyBuffer =
+            il2cpp_utils::resolve_icall<void, StringW>("UnityEngine.GUIUtility::set_systemCopyBuffer");
+        UnityEngine_GUIUtility_set_systemCopyBuffer(bsr);
+    } catch (...) {
+        ERROR("Failed to copy BSR");
+    }
+}
+
+void Modals::UploadDetails::ctor() {
     INVOKE_CTOR();
     this->initialized = false;
 }
 
-void Modals::UploadDetails::OpenModal(const SongDetailsCache::Song* song)
-{
+void Modals::UploadDetails::OpenModal(SongDetailsCache::Song const* song) {
     if (!initialized) {
         BSML::parse_and_construct(Assets::UploadDetails_bsml, this->get_transform(), this);
         initialized = true;
@@ -62,11 +85,12 @@ void Modals::UploadDetails::OpenModal(const SongDetailsCache::Song* song)
     auto groupedDiffs = GroupCharByDiff(song);
     std::string characteristicsText = "";
     int loopCount = 1;
-    for(auto& it: groupedDiffs) {
-        if(loopCount < groupedDiffs.size())
+    for (auto& it : groupedDiffs) {
+        if (loopCount < groupedDiffs.size()) {
             characteristicsText.append(fmt::format("{}x {}, ", it.second, it.first));
-        else
+        } else {
             characteristicsText.append(fmt::format("{}x {}", it.second, it.first));
+        }
         loopCount++;
     }
     selectedCharacteristics->set_text(characteristicsText);
@@ -78,7 +102,7 @@ void Modals::UploadDetails::OpenModal(const SongDetailsCache::Song* song)
     songDetailsLoading->get_gameObject()->SetActive(true);
 
     BeatSaverRegionManager::GetSongDescription(std::string(song->key()), [this](std::string value) {
-        BSML::MainThreadScheduler::Schedule([this, value]{
+        BSML::MainThreadScheduler::Schedule([this, value] {
             selectedSongDescription->SetText(value);
             songDetailsLoading->get_gameObject()->SetActive(false);
         });
@@ -86,4 +110,3 @@ void Modals::UploadDetails::OpenModal(const SongDetailsCache::Song* song)
 
     this->rootModal->Show();
 }
-
diff --git a/src/UI/ViewControllers/DownloadHistory.cpp b/src/UI/ViewControllers/DownloadHistory.cpp
index 27086ad..9c88665 100644
--- a/src/UI/ViewControllers/DownloadHistory.cpp
+++ b/src/UI/ViewControllers/DownloadHistory.cpp
@@ -1,27 +1,20 @@
 #include "UI/ViewControllers/DownloadHistory.hpp"
 
-#include <bsml/shared/BSML/MainThreadScheduler.hpp>
-
-#include "main.hpp"
-#include "logging.hpp"
-
-#include "HMUI/TableView.hpp"
-
-#include "bsml/shared/BSML.hpp"
-#include "songcore/shared/SongCore.hpp"
+#include "assets.hpp"
 #include "beatsaverplusplus/shared/BeatSaver.hpp"
-#include "web-utils/shared/WebUtils.hpp"
-
+#include "bsml/shared/BSML.hpp"
+#include "bsml/shared/BSML/MainThreadScheduler.hpp"
+#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
 #include "GlobalNamespace/LevelCollectionTableView.hpp"
-#include "assets.hpp"
-#include "Util/CurrentTimeMs.hpp"
-#include "UI/ViewControllers/DownloadListTableData.hpp"
+#include "HMUI/TableView.hpp"
+#include "logging.hpp"
+#include "songcore/shared/SongCore.hpp"
 #include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
-
+#include "UI/ViewControllers/DownloadListTableData.hpp"
 #include "UnityEngine/Resources.hpp"
-#include "bsml/shared/BSML/MainThreadScheduler.hpp"
-#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
+#include "Util/CurrentTimeMs.hpp"
 #include "Util/TextUtil.hpp"
+#include "web-utils/shared/WebUtils.hpp"
 
 using namespace BetterSongSearch::UI;
 using namespace BetterSongSearch::Util;
@@ -29,8 +22,7 @@ using namespace BetterSongSearch::Util;
 
 DEFINE_TYPE(BetterSongSearch::UI::ViewControllers, DownloadHistoryViewController);
 
-void errored(std::string message, SafePtr<DownloadHistoryEntry> entry)
-{
+void errored(std::string message, SafePtr<DownloadHistoryEntry> entry) {
     entry->status = DownloadHistoryEntry::DownloadStatus::Failed;
     entry->statusDetails = fmt::format(": {}", message);
     entry->retries = 69;
@@ -42,63 +34,65 @@ struct CustomDLBeatMapResponse {
     int responseCode;
 };
 
-CustomDLBeatMapResponse CursomDownloadBeatmap(BeatSaver::API::BeatmapDownloadInfo info, std::function<void(float)> progressReport = nullptr) {
+CustomDLBeatMapResponse CustomDownloadBeatmap(BeatSaver::API::BeatmapDownloadInfo info, std::function<void(float)> progressReport = nullptr) {
     auto [options, response] = DownloadBeatmapURLOptionsAndResponse(info);
     BeatSaver::API::GetBeatsaverDownloader().GetInto(options, &response, progressReport);
-    return {
-        response.responseData, 
-        response.get_CurlStatus(),
-        response.get_HttpCode()
-    };
+    return {response.responseData, response.get_CurlStatus(), response.get_HttpCode()};
 }
 
-void ViewControllers::DownloadHistoryViewController::DidActivate(bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling)
-{
-    if (!firstActivation)
+void ViewControllers::DownloadHistoryViewController::DidActivate(bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling) {
+    if (!firstActivation) {
         return;
+    }
 
-    limitedFullTableReload = new BetterSongSearch::Util::RatelimitCoroutine([this](){
-        BSML::MainThreadScheduler::Schedule([this]{
-            auto table = this->downloadHistoryTable();
-            if (table) table->ReloadData();
-        });
-    }, 0.2f);
-
+    limitedFullTableReload = new BetterSongSearch::Util::RatelimitCoroutine(
+        [this]() {
+            BSML::MainThreadScheduler::Schedule([this] {
+                auto table = this->downloadHistoryTable();
+                if (table) {
+                    table->ReloadData();
+                }
+            });
+        },
+        0.2f
+    );
 
     INFO("Download contoller activated");
     BSML::parse_and_construct(Assets::DownloadHistory_bsml, this->get_transform(), this);
 
-    if (this->downloadList != nullptr)
-    {
+    if (this->downloadList != nullptr) {
         INFO("Table exists");
-        downloadList->tableView->SetDataSource(reinterpret_cast<HMUI::TableView::IDataSource *>(this), false);
+        downloadList->tableView->SetDataSource(reinterpret_cast<HMUI::TableView::IDataSource*>(this), false);
     }
 
-    // BSML has a bug that stops getting the correct platform helper and on game reset it dies and the scrollhelper stays invalid and scroll doesn't work
-    auto platformHelper = UnityEngine::Resources::FindObjectsOfTypeAll<GlobalNamespace::LevelCollectionTableView*>()->First()->GetComponentInChildren<HMUI::ScrollView*>()->____platformHelper;
+    // BSML has a bug that stops getting the correct platform helper and on game reset it dies and the scrollhelper stays invalid and scroll doesn't
+    // work
+    auto platformHelper = UnityEngine::Resources::FindObjectsOfTypeAll<GlobalNamespace::LevelCollectionTableView*>()
+                              ->First()
+                              ->GetComponentInChildren<HMUI::ScrollView*>()
+                              ->____platformHelper;
     if (platformHelper == nullptr) {
     } else {
-        for (auto x: this->GetComponentsInChildren<HMUI::ScrollView*>()){
-            x->____platformHelper=platformHelper;
+        for (auto x : this->GetComponentsInChildren<HMUI::ScrollView*>()) {
+            x->____platformHelper = platformHelper;
         }
     }
 
-
-    #ifdef HotReload
-        fileWatcher->filePath = "/sdcard/DownloadHistory.bsml";
-    #endif
+#ifdef HotReload
+    fileWatcher->filePath = "/sdcard/bsml/BetterSongSearch/DownloadHistory.bsml";
+    fileWatcher->checkInterval = 0.5f;
+#endif
 }
 
-void ViewControllers::DownloadHistoryViewController::SelectSong(HMUI::TableView *table, int id)
-{
+void ViewControllers::DownloadHistoryViewController::SelectSong(HMUI::TableView* table, int id) {
     DEBUG("Cell is clicked");
     if (id >= NumberOfCells()) {
         WARNING("Non existent song id");
         return;
-    } 
-    
+    }
+
     auto entry = downloadEntryList[id];
-    INFO("Selecting a song {}", entry->songName );
+    INFO("Selecting a song {}", entry->songName);
 
     // If downloaded then select the song
     if (entry->status == DownloadHistoryEntry::DownloadStatus::Downloaded) {
@@ -106,65 +100,57 @@ void ViewControllers::DownloadHistoryViewController::SelectSong(HMUI::TableView
         auto controller = fcInstance->SongListController;
         controller->SelectSongByHash(entry->hash);
         controller->songListTable()->ClearSelection();
-    } else if (entry->status == DownloadHistoryEntry::DownloadStatus::Failed){
+    } else if (entry->status == DownloadHistoryEntry::DownloadStatus::Failed) {
         entry->retries = 0;
         ProcessDownloads(true);
     }
 
-    // Reset selection 
+    // Reset selection
     this->downloadHistoryTable()->ClearSelection();
-
 }
 
-float ViewControllers::DownloadHistoryViewController::CellSize()
-{
+float ViewControllers::DownloadHistoryViewController::CellSize() {
     return this->cellSize;
 }
-int ViewControllers::DownloadHistoryViewController::NumberOfCells()
-{
+
+int ViewControllers::DownloadHistoryViewController::NumberOfCells() {
     return downloadEntryList.size();
 }
 
-void ViewControllers::DownloadHistoryViewController::ctor()
-{
+void ViewControllers::DownloadHistoryViewController::ctor() {
     INVOKE_CTOR();
     this->cellSize = 8.05f;
 }
+
 // BSML::CustomCellInfo
-HMUI::TableCell *ViewControllers::DownloadHistoryViewController::CellForIdx(HMUI::TableView *tableView, int idx)
-{
+HMUI::TableCell* ViewControllers::DownloadHistoryViewController::CellForIdx(HMUI::TableView* tableView, int idx) {
     return ViewControllers::DownloadListTableData::GetCell(tableView)->PopulateWithSongData(downloadEntryList[idx]);
 }
 
-bool ViewControllers::DownloadHistoryViewController::TryAddDownload(const SongDetailsCache::Song *song, bool isBatch)
-{
-    DownloadHistoryEntry *existingDLHistoryEntry = nullptr;
-
-    for (auto entry : downloadEntryList)
-    {
+bool ViewControllers::DownloadHistoryViewController::TryAddDownload(SongDetailsCache::Song const* song, bool isBatch) {
+    DownloadHistoryEntry* existingDLHistoryEntry = nullptr;
 
-        if (entry->key == song->key())
-        {
+    for (auto entry : downloadEntryList) {
+        if (entry->key == song->key()) {
             existingDLHistoryEntry = entry;
             break;
         }
     }
 
-    if (existingDLHistoryEntry)
+    if (existingDLHistoryEntry) {
         existingDLHistoryEntry->ResetIfFailed();
+    }
 
-    if(!CheckIsDownloadable(song->hash()))
+    if (!CheckIsDownloadable(song->hash())) {
         return false;
+    }
 
-    if (existingDLHistoryEntry == nullptr)
-    {
+    if (existingDLHistoryEntry == nullptr) {
         // var newPos = downloadList.FindLastIndex(x => x.status > DownloadHistoryEntry.DownloadStatus.Queued);
         downloadEntryList.push_back(new DownloadHistoryEntry(song));
         downloadHistoryTable()->ReloadData();
         downloadHistoryTable()->ScrollToCellWithIdx(0, HMUI::TableView::ScrollPositionType::Beginning, false);
-    }
-    else
-    {
+    } else {
         existingDLHistoryEntry->status = DownloadHistoryEntry::DownloadStatus::Queued;
     }
 
@@ -172,76 +158,73 @@ bool ViewControllers::DownloadHistoryViewController::TryAddDownload(const SongDe
 
     return true;
 }
-void ViewControllers::DownloadHistoryViewController::ProcessDownloads(bool forceTableReload)
-{
 
-    if (!this->get_gameObject()->get_activeInHierarchy())
+void ViewControllers::DownloadHistoryViewController::ProcessDownloads(bool forceTableReload) {
+    if (!this->get_gameObject()->get_activeInHierarchy()) {
         return;
+    }
 
     // Count the ones  that need to be downloaded
     int count = 0;
-    for (auto entry : downloadEntryList)
-    {
-        if (entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(DownloadHistoryEntry::DownloadStatus::Preparing | DownloadHistoryEntry::DownloadStatus::Downloading)))
-        {
+    for (auto entry : downloadEntryList) {
+        if (entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(
+                DownloadHistoryEntry::DownloadStatus::Preparing | DownloadHistoryEntry::DownloadStatus::Downloading
+            ))) {
             count++;
         }
     }
-    if (count >= MAX_PARALLEL_DOWNLOADS)
-    {
-        if (forceTableReload)
-        {
+    if (count >= MAX_PARALLEL_DOWNLOADS) {
+        if (forceTableReload) {
             this->RefreshTable();
         }
         return;
     }
     // Get first entry
     DownloadHistoryEntry* currentEntry = nullptr;
-    for (auto entry : downloadEntryList)
-    {
-        if (entry->retries < RETRY_COUNT && entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(DownloadHistoryEntry::DownloadStatus::Failed | DownloadHistoryEntry::DownloadStatus::Queued)))
-        {
-            if (!currentEntry)
-            {
+    for (auto entry : downloadEntryList) {
+        if (entry->retries < RETRY_COUNT && entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(
+                                                DownloadHistoryEntry::DownloadStatus::Failed | DownloadHistoryEntry::DownloadStatus::Queued
+                                            ))) {
+            if (!currentEntry) {
                 currentEntry = entry;
                 continue;
             }
-            if (entry->orderValue() > currentEntry->orderValue())
-            {
+            if (entry->orderValue() > currentEntry->orderValue()) {
                 currentEntry = entry;
             }
         }
     }
 
-    
-
-    if (!currentEntry)
-    {
+    if (!currentEntry) {
         RefreshTable(forceTableReload);
         return;
     }
 
     // We have the entry, now we need to download
-    if (currentEntry->status == DownloadHistoryEntry::DownloadStatus::Failed)
+    if (currentEntry->status == DownloadHistoryEntry::DownloadStatus::Failed) {
         currentEntry->retries++;
+    }
     currentEntry->downloadProgress = 0.0f;
     currentEntry->status = DownloadHistoryEntry::DownloadStatus::Preparing;
     currentEntry->lastUpdate = CurrentTimeMs();
     RefreshTable(true);
-    
-    std::function<void(float)> progressUpdate = [this,  currentEntry](float downloadProgress)
-    {
+
+    std::function<void(float)> progressUpdate = [this, currentEntry](float downloadProgress) {
         auto now = CurrentTimeMs();
         if (now - currentEntry->lastUpdate < 50) {
             return;
         }
-        
-        currentEntry->statusDetails = fmt::format("({}%{})", (int)round(downloadProgress*100), currentEntry->retries == 0 ? "": fmt::format(", retry {} / {}", currentEntry->retries, RETRY_COUNT));
+
+        currentEntry->statusDetails = fmt::format(
+            "({}%{})",
+            (int) round(downloadProgress * 100),
+            currentEntry->retries == 0 ? "" : fmt::format(", retry {} / {}", currentEntry->retries, RETRY_COUNT)
+        );
         currentEntry->lastUpdate = now;
 
         currentEntry->downloadProgress = downloadProgress;
-        if(currentEntry->UpdateProgressHandler != nullptr) {
-            BSML::MainThreadScheduler::Schedule([currentEntry]{
+        if (currentEntry->UpdateProgressHandler != nullptr) {
+            BSML::MainThreadScheduler::Schedule([currentEntry] {
                 currentEntry->UpdateProgressHandler();
             });
         }
@@ -254,17 +237,14 @@ void ViewControllers::DownloadHistoryViewController::ProcessDownloads(bool force
 
     RefreshTable(true);
 
-    std::thread([this, currentEntry, forceTableReload, progressUpdate]{
-        auto response = WebUtils::Get<BeatSaver::API::BeatmapResponse>(
-            BeatSaver::API::GetBeatmapByHashURLOptions(std::string(currentEntry->hash))
-        );
-        
-        if (!response.IsSuccessful())
-        {
+    std::thread([this, currentEntry, forceTableReload, progressUpdate] {
+        auto response = WebUtils::Get<BeatSaver::API::BeatmapResponse>(BeatSaver::API::GetBeatmapByHashURLOptions(std::string(currentEntry->hash)));
+
+        if (!response.IsSuccessful()) {
             int responseCode = response.httpCode;
             int curlStatus = response.curlStatus;
-            
-            BSML::MainThreadScheduler::Schedule([this, currentEntry, forceTableReload, responseCode, curlStatus]{
+
+            BSML::MainThreadScheduler::Schedule([this, currentEntry, forceTableReload, responseCode, curlStatus] {
                 std::string message = "";
 
                 if (curlStatus != 0) {
@@ -277,7 +257,7 @@ void ViewControllers::DownloadHistoryViewController::ProcessDownloads(bool force
                         message = Util::httpErrorToString(responseCode);
                     }
                 }
-                
+
                 errored(message, currentEntry);
                 RefreshTable(true);
                 this->ProcessDownloads(forceTableReload);
@@ -286,9 +266,8 @@ void ViewControllers::DownloadHistoryViewController::ProcessDownloads(bool force
         }
 
         auto gotBeatmap = response.responseData.has_value();
-        if (!gotBeatmap)
-        {
-            BSML::MainThreadScheduler::Schedule([this, currentEntry, forceTableReload]{
+        if (!gotBeatmap) {
+            BSML::MainThreadScheduler::Schedule([this, currentEntry, forceTableReload] {
                 errored("Response is empty", currentEntry);
                 RefreshTable(true);
                 this->ProcessDownloads(forceTableReload);
@@ -299,146 +278,136 @@ void ViewControllers::DownloadHistoryViewController::ProcessDownloads(bool force
         auto beatmap = response.responseData.value();
         DEBUG("Beatmap name: {}", beatmap.GetName());
 
-        auto dlInfo = CursomDownloadBeatmap(
-            BeatSaver::API::BeatmapDownloadInfo(beatmap),
-            progressUpdate
-        );
+        auto dlInfo = CustomDownloadBeatmap(BeatSaver::API::BeatmapDownloadInfo(beatmap), progressUpdate);
 
-        BSML::MainThreadScheduler::Schedule(
-            [dlInfo, this, currentEntry, forceTableReload]
-            {
-                auto path = dlInfo.path;
-                int curlStatus = dlInfo.curlStatus;
-                int responseCode = dlInfo.responseCode;
+        BSML::MainThreadScheduler::Schedule([dlInfo, this, currentEntry, forceTableReload] {
+            auto path = dlInfo.path;
+            int curlStatus = dlInfo.curlStatus;
+            int responseCode = dlInfo.responseCode;
 
-                if (!path.has_value()) {
-                    DEBUG("ERROR DOWNLOADING SONG");
+            if (!path.has_value()) {
+                DEBUG("ERROR DOWNLOADING SONG");
 
-                    std::string message = "";
-                    if (curlStatus != 0) {
-                        message = Util::curlErrorToString(curlStatus);
-                        message = fmt::format("Curl: {}", message);
+                std::string message = "";
+                if (curlStatus != 0) {
+                    message = Util::curlErrorToString(curlStatus);
+                    message = fmt::format("Curl: {}", message);
+                } else {
+                    if (responseCode == 404) {
+                        message = "Song file not found";
                     } else {
-                        if (responseCode == 404) {
-                            message = "Song file not found";
-                        } else {
-                            message = Util::httpErrorToString(responseCode);
-                        }
+                        message = Util::httpErrorToString(responseCode);
                     }
+                }
 
-                    DEBUG("Error downloading the song: {}", message);
-                    errored(message, currentEntry);
-                    RefreshTable(true);
-                    this->ProcessDownloads(forceTableReload);
-                } else {
-                    currentEntry->status = DownloadHistoryEntry::DownloadStatus::Downloaded;
-                    currentEntry->statusDetails = "";
-                    currentEntry->downloadProgress = 1.0f;
-                    DEBUG("Success downloading the song");
-                    RefreshTable(true);
-                    hasUnloadedDownloads = true;
-                    this->ProcessDownloads(forceTableReload);
+                DEBUG("Error downloading the song: {}", message);
+                errored(message, currentEntry);
+                RefreshTable(true);
+                this->ProcessDownloads(forceTableReload);
+            } else {
+                currentEntry->status = DownloadHistoryEntry::DownloadStatus::Downloaded;
+                currentEntry->statusDetails = "";
+                currentEntry->downloadProgress = 1.0f;
+                DEBUG("Success downloading the song");
+                RefreshTable(true);
+                hasUnloadedDownloads = true;
+                this->ProcessDownloads(forceTableReload);
+            }
+            // If has no more dls left, refresh songs
+            if (!this->HasPendingDownloads()) {
+                // Do not refresh songs if not active anymore
+                if (this->get_isActiveAndEnabled()) {
+                    SongCore::API::Loading::RefreshSongs(false);
+                    hasUnloadedDownloads = false;
                 }
-                // If has no more dls left, refresh songs
-                if (!this->HasPendingDownloads()) {
-                    // Do not refresh songs if not active anymore
-                    if (this->get_isActiveAndEnabled()) {
-                        SongCore::API::Loading::RefreshSongs(false);
-                        hasUnloadedDownloads = false;
+            }
+            if (fcInstance->SongListController->currentSong != nullptr) {
+                if (currentEntry->status == DownloadHistoryEntry::DownloadStatus::Downloaded) {
+                    // NESTING HELLLL
+                    if (fcInstance->SongListController->currentSong->hash() == currentEntry->hash) {
+                        fcInstance->SongListController->SetIsDownloaded(true);
                     }
-                }
-                if (fcInstance->SongListController->currentSong != nullptr) {
-                    if(currentEntry->status == DownloadHistoryEntry::DownloadStatus::Downloaded) {
-                        // NESTING HELLLL      
-                        if (fcInstance->SongListController->currentSong->hash() == currentEntry->hash) {
-                            fcInstance->SongListController->SetIsDownloaded(true);
-                        }
-                        fcInstance->SongListController->songListTable()->RefreshCells(false, true);
-                    } else {
-                        if (fcInstance->SongListController->currentSong->hash() == currentEntry->hash) {
-                            fcInstance->SongListController->SetIsDownloaded(false);
-                        }
+                    fcInstance->SongListController->songListTable()->RefreshCells(false, true);
+                } else {
+                    if (fcInstance->SongListController->currentSong->hash() == currentEntry->hash) {
+                        fcInstance->SongListController->SetIsDownloaded(false);
                     }
                 }
+            }
         });
     }).detach();
+
     this->ProcessDownloads(forceTableReload);
 }
 
-void ViewControllers::DownloadHistoryViewController::RefreshTable(bool fullReload)
-{
-    BSML::MainThreadScheduler::Schedule(
-    [this]
-    {
+void ViewControllers::DownloadHistoryViewController::RefreshTable(bool fullReload) {
+    BSML::MainThreadScheduler::Schedule([this] {
         DEBUG("Refreshing table");
         // Sort entry list
-        std::stable_sort(downloadEntryList.begin(), downloadEntryList.end(),
-            [] (DownloadHistoryEntry* entry1, DownloadHistoryEntry* entry2)
-            {
-                return (entry1->orderValue() < entry2->orderValue());
-            }
-        );
+        std::stable_sort(downloadEntryList.begin(), downloadEntryList.end(), [](DownloadHistoryEntry* entry1, DownloadHistoryEntry* entry2) {
+            return (entry1->orderValue() < entry2->orderValue());
+        });
         DEBUG("Starting coroutine to refresh table");
         this->StartCoroutine(custom_types::Helpers::new_coro(this->limitedFullTableReload->Call()));
     });
 }
 
-bool ViewControllers::DownloadHistoryViewController::CheckIsDownloadedAndLoaded(std::string songHash){
+bool ViewControllers::DownloadHistoryViewController::CheckIsDownloadedAndLoaded(std::string songHash) {
     auto level = SongCore::API::Loading::GetLevelByHash(songHash);
     return level != nullptr;
 };
 
-DownloadHistoryEntry* ViewControllers::DownloadHistoryViewController::GetDownloadByHash(std::string hash){
-    for(auto entry : this->downloadEntryList) {
-        if(entry->hash == hash) {
+DownloadHistoryEntry* ViewControllers::DownloadHistoryViewController::GetDownloadByHash(std::string hash) {
+    for (auto entry : this->downloadEntryList) {
+        if (entry->hash == hash) {
             return entry;
         }
     }
     return nullptr;
 }
-bool ViewControllers::DownloadHistoryViewController::CheckIsDownloadable(DownloadHistoryEntry* entry){
+
+bool ViewControllers::DownloadHistoryViewController::CheckIsDownloadable(DownloadHistoryEntry* entry) {
     auto dlElem = entry;
-    if (dlElem == nullptr) return true;
-    if (dlElem->retries == 3 && dlElem->status == DownloadHistoryEntry::DownloadStatus::Failed) return true;
-
-    if (
-        !dlElem->IsInAnyOfStates(
-            (DownloadHistoryEntry::DownloadStatus) (
-                DownloadHistoryEntry::DownloadStatus::Preparing |
-                DownloadHistoryEntry::DownloadStatus::Downloading |
-                DownloadHistoryEntry::DownloadStatus::Queued
-            )
-        ) && !CheckIsDownloaded(dlElem->hash)){
+    if (dlElem == nullptr) {
+        return true;
+    }
+    if (dlElem->retries == 3 && dlElem->status == DownloadHistoryEntry::DownloadStatus::Failed) {
         return true;
     }
 
-    return false;
+    if (!dlElem->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(
+            DownloadHistoryEntry::DownloadStatus::Preparing | DownloadHistoryEntry::DownloadStatus::Downloading |
+            DownloadHistoryEntry::DownloadStatus::Queued
+        )) &&
+        !CheckIsDownloaded(dlElem->hash)) {
+        return true;
+    }
 
+    return false;
 }
 
-bool ViewControllers::DownloadHistoryViewController::CheckIsDownloaded(std::string songHash){
+bool ViewControllers::DownloadHistoryViewController::CheckIsDownloaded(std::string songHash) {
     auto entry = this->GetDownloadByHash(songHash);
     bool downloadedInList = false;
 
-    if (entry != nullptr && entry->status == DownloadHistoryEntry::DownloadStatus::Downloaded){
+    if (entry != nullptr && entry->status == DownloadHistoryEntry::DownloadStatus::Downloaded) {
         downloadedInList = true;
     };
     return (downloadedInList || CheckIsDownloadedAndLoaded(songHash));
 }
 
-bool ViewControllers::DownloadHistoryViewController::CheckIsDownloadable(std::string songHash){
+bool ViewControllers::DownloadHistoryViewController::CheckIsDownloadable(std::string songHash) {
     auto dlElem = this->GetDownloadByHash(songHash);
     return this->CheckIsDownloadable(dlElem);
 }
 
-bool ViewControllers::DownloadHistoryViewController::HasPendingDownloads(){
-    for (auto entry : downloadEntryList)
-    {
-        if (entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(DownloadHistoryEntry::DownloadStatus::Downloading | DownloadHistoryEntry::DownloadStatus::Queued)))
-        {
+bool ViewControllers::DownloadHistoryViewController::HasPendingDownloads() {
+    for (auto entry : downloadEntryList) {
+        if (entry->IsInAnyOfStates((DownloadHistoryEntry::DownloadStatus)(
+                DownloadHistoryEntry::DownloadStatus::Downloading | DownloadHistoryEntry::DownloadStatus::Queued
+            ))) {
             return true;
         }
     }
     return false;
 };
-
diff --git a/src/UI/ViewControllers/DownloadHistoryCell.cpp b/src/UI/ViewControllers/DownloadHistoryCell.cpp
index b46efe1..9843397 100644
--- a/src/UI/ViewControllers/DownloadHistoryCell.cpp
+++ b/src/UI/ViewControllers/DownloadHistoryCell.cpp
@@ -3,6 +3,7 @@
 #include "UnityEngine/RectTransform.hpp"
 
 DEFINE_TYPE(BetterSongSearch::UI::ViewControllers, CustomDownloadListTableCell)
+
 namespace BetterSongSearch::UI::ViewControllers {
     CustomDownloadListTableCell* CustomDownloadListTableCell::PopulateWithSongData(DownloadHistoryEntry* entry) {
         songName->set_text(entry->songName);
@@ -21,17 +22,23 @@ namespace BetterSongSearch::UI::ViewControllers {
     }
 
     void CustomDownloadListTableCell::RefreshBar() {
-        if(!entry)
+        if (!entry) {
             return;
-        auto clr = entry->status == DownloadHistoryEntry::Failed ? UnityEngine::Color::get_red() : entry->status != DownloadHistoryEntry::DownloadStatus::Queued ? UnityEngine::Color::get_green() : UnityEngine::Color::get_gray();
+        }
+        auto clr = entry->status == DownloadHistoryEntry::Failed                 ? UnityEngine::Color::get_red()
+                 : entry->status != DownloadHistoryEntry::DownloadStatus::Queued ? UnityEngine::Color::get_green()
+                                                                                 : UnityEngine::Color::get_gray();
         clr.a = 0.5f + (entry->downloadProgress * 0.4f);
         bgProgress->set_color(clr);
 
         auto x = bgProgress->get_gameObject()->get_transform().cast<UnityEngine::RectTransform>();
-        if(!x)
+        if (!x) {
             return;
+        }
         x->set_anchorMax(UnityEngine::Vector2(entry->downloadProgress, 1));
-        static auto forceUpdate = reinterpret_cast<function_ptr_t<void, UnityEngine::RectTransform*>>(il2cpp_functions::resolve_icall("UnityEngine.RectTransform::ForceUpdateRectTransforms"));
+        static auto forceUpdate = reinterpret_cast<function_ptr_t<void, UnityEngine::RectTransform*>>(
+            il2cpp_functions::resolve_icall("UnityEngine.RectTransform::ForceUpdateRectTransforms")
+        );
         forceUpdate(x);
     }
 
@@ -51,5 +58,4 @@ namespace BetterSongSearch::UI::ViewControllers {
     void CustomDownloadListTableCell::WasPreparedForReuse() {
         entry->UpdateProgressHandler = nullptr;
     }
-}
-
+}  // namespace BetterSongSearch::UI::ViewControllers
diff --git a/src/UI/ViewControllers/FilterView.cpp b/src/UI/ViewControllers/FilterView.cpp
index 2386737..9786547 100644
--- a/src/UI/ViewControllers/FilterView.cpp
+++ b/src/UI/ViewControllers/FilterView.cpp
@@ -1,64 +1,59 @@
 #include "UI/ViewControllers/FilterView.hpp"
 
+#include <fmt/chrono.h>
+
+#include <UnityEngine/Resources.hpp>
+
+#include "assets.hpp"
 #include "bsml/shared/BSML.hpp"
 #include "bsml/shared/BSML/Components/Backgroundable.hpp"
+#include "bsml/shared/BSML/MainThreadScheduler.hpp"
+#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
+#include "DataHolder.hpp"
+#include "DateUtils.hpp"
+#include "Formatters.hpp"
+#include "HMUI/CurvedTextMeshPro.hpp"
 #include "HMUI/ImageView.hpp"
-
-#include "main.hpp"
 #include "logging.hpp"
 #include "PluginConfig.hpp"
-#include "assets.hpp"
-
-#include <fmt/chrono.h>
-#include <UnityEngine/Resources.hpp>
-
-#include "FilterOptions.hpp"
-#include "DateUtils.hpp"
-#include "UI/ViewControllers/SongList.hpp"
-#include "Util/BSMLStuff.hpp"
+#include "TMPro/TextMeshProUGUI.hpp"
 #include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
+#include "Util/BSMLStuff.hpp"
 #include "Util/TextUtil.hpp"
-#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
-
 
 using namespace BetterSongSearch::Util;
 using namespace BetterSongSearch::UI;
 using namespace BetterSongSearch::UI::Util::BSMLStuff;
 
-static const std::chrono::system_clock::time_point BEATSAVER_EPOCH_TIME_POINT{std::chrono::seconds(FilterOptions::BEATSAVER_EPOCH)};
 DEFINE_TYPE(BetterSongSearch::UI::ViewControllers, FilterViewController);
 
 #define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
 
-#define SAVE_STRING_CONFIG(value, options, configName, filterProperty ) \
-    if (value != nullptr) { \
-        int index = get_##options()->IndexOf(reinterpret_cast<System::String*> (value.convert())); \
-        if (index < 0 ) { \
-            ERROR("WE HAVE A BUG WITH SAVING VALUE {}", (std::string) value); \
-        } else { \
-            if (index != getPluginConfig().configName.GetValue()) { \
-                filtersChanged = true; \
-                getPluginConfig().configName.SetValue(index); \
-                DataHolder::filterOptions.filterProperty = (typeof(DataHolder::filterOptions.filterProperty)) index; \
-            } \
-        }\
+#define SAVE_STRING_CONFIG(value, options, configName)                                            \
+    if (value != nullptr) {                                                                       \
+        int index = get_##options()->IndexOf(reinterpret_cast<System::String*>(value.convert())); \
+        if (index < 0) {                                                                          \
+            ERROR("WE HAVE A BUG WITH SAVING VALUE {}", (std::string) value);                     \
+        } else {                                                                                  \
+            if (index != getPluginConfig().configName.GetValue()) {                               \
+                filtersChanged = true;                                                            \
+                getPluginConfig().configName.SetValue(index);                                     \
+            }                                                                                     \
+        }                                                                                         \
     }
 
-#define SAVE_NUMBER_CONFIG(value, configName, filterProperty) \
+#define SAVE_NUMBER_CONFIG(value, configName)               \
     if (value != getPluginConfig().configName.GetValue()) { \
-        filtersChanged = true; \
-        getPluginConfig().configName.SetValue(value); \
-        DataHolder::filterOptions.filterProperty = (typeof(DataHolder::filterOptions.filterProperty)) value; \
-    } \
+        filtersChanged = true;                              \
+        getPluginConfig().configName.SetValue(value);       \
+    }
 
 // TODO: Fix saving last saved
-#define SAVE_INTEGER_CONFIG(value, configName, filterProperty) \
+#define SAVE_INTEGER_CONFIG(value, configName)                                \
     if (static_cast<int>(value) != getPluginConfig().configName.GetValue()) { \
-        filtersChanged = true; \
-        getPluginConfig().configName.SetValue(static_cast<int>(value)); \
-        DataHolder::filterOptions.filterProperty = static_cast<int>(value); \
-    } \
-
+        filtersChanged = true;                                                \
+        getPluginConfig().configName.SetValue(static_cast<int>(value));       \
+    }
 
 // TODO: Fix unlimited to better search songs outside of filters boundaries
 custom_types::Helpers::Coroutine ViewControllers::FilterViewController::_UpdateFilterSettings() {
@@ -67,45 +62,34 @@ custom_types::Helpers::Coroutine ViewControllers::FilterViewController::_UpdateF
 
     // WARNING: There is a bug with bsml update, it runs before the value is changed for some reason
     bool filtersChanged = false;
-//    if (this->existingSongs != nullptr) {
-//        int index = get_downloadedFilterOptions()->IndexOf(reinterpret_cast<System::String*> (this->existingSongs.convert()));
-//        if (index < 0) {
-//            getLogger().fmtLog<Paper::LogLevel::ERR>("WE HAVE A BUG WITH SAVING VALUE {}",
-//                                                     (std::string) this->existingSongs);
-//        }
-//        else {
-//            if (index != getPluginConfig().DownloadType.GetValue()) {
-//                filtersChanged = true;
-//                getPluginConfig().DownloadType.SetValue(index);
-//                DataHolder::filterOptions.downloadType = (typeof(DataHolder::filterOptions.downloadType)) index;
-//            }
-//        }
-//    }
-    SAVE_STRING_CONFIG(this->existingSongs, downloadedFilterOptions, DownloadType, downloadType);
-    SAVE_STRING_CONFIG(this->existingScore, scoreFilterOptions, LocalScoreType , localScoreType);
-
-    SAVE_STRING_CONFIG(this->characteristic, characteristics, CharacteristicType, charFilter);
-    SAVE_STRING_CONFIG(this->difficulty, difficulties, DifficultyType, difficultyFilter);
-    SAVE_STRING_CONFIG(this->rankedState, rankedFilterOptions, RankedType, rankedType);
-    SAVE_STRING_CONFIG(this->mods, modOptions, RequirementType, modRequirement);
-    SAVE_NUMBER_CONFIG(this->minimumNjs, MinNJS, minNJS);
-    SAVE_NUMBER_CONFIG(this->maximumNjs,MaxNJS,  maxNJS);
-    SAVE_NUMBER_CONFIG(this->minimumNps, MinNPS, minNPS);
-    SAVE_NUMBER_CONFIG(this->maximumNps,MaxNPS,  maxNPS);
-    SAVE_NUMBER_CONFIG(this->minimumStars,MinStars, minStars);
-    SAVE_NUMBER_CONFIG(this->maximumStars,MaxStars,  maxStars);
-    SAVE_NUMBER_CONFIG(this->minimumRating, MinRating, minRating);
-    SAVE_INTEGER_CONFIG(this->minimumVotes,MinVotes, minVotes);
+
+    SAVE_STRING_CONFIG(this->existingSongs, downloadedFilterOptions, DownloadType);
+    SAVE_STRING_CONFIG(this->existingScore, scoreFilterOptions, LocalScoreType);
+
+    SAVE_STRING_CONFIG(this->characteristic, characteristics, CharacteristicType);
+    SAVE_STRING_CONFIG(this->difficulty, difficulties, DifficultyType);
+    SAVE_STRING_CONFIG(this->rankedState, rankedFilterOptions, RankedType);
+    SAVE_STRING_CONFIG(this->mods, modOptions, RequirementType);
+    SAVE_NUMBER_CONFIG(this->minimumNjs, MinNJS);
+    SAVE_NUMBER_CONFIG(this->maximumNjs, MaxNJS);
+    SAVE_NUMBER_CONFIG(this->minimumNps, MinNPS);
+    SAVE_NUMBER_CONFIG(this->maximumNps, MaxNPS);
+    SAVE_NUMBER_CONFIG(this->minimumStars, MinStars);
+    SAVE_NUMBER_CONFIG(this->maximumStars, MaxStars);
+    SAVE_NUMBER_CONFIG(this->minimumRating, MinRating);
+    SAVE_INTEGER_CONFIG(this->minimumVotes, MinVotes);
+
+    if (this->mapStyleString != getPluginConfig().MapStyleString.GetValue()) {
+        filtersChanged = true;
+        getPluginConfig().MapStyleString.SetValue(this->mapStyleString);
+    }
 
     // Special case for saving date
     if (this->hideOlderThan != getPluginConfig().MinUploadDateInMonths.GetValue()) {
         filtersChanged = true;
 
-        auto timestamp = GetDateAfterMonths(DataHolder::filterOptions.BEATSAVER_EPOCH, this->hideOlderThan).count();
-
-        DataHolder::filterOptions.minUploadDate = timestamp;
-        DataHolder::filterOptions.minUploadDateInMonths = this->hideOlderThan;
-        DEBUG("Date {}", GetDateAfterMonths(DataHolder::filterOptions.BEATSAVER_EPOCH, this->hideOlderThan));
+        auto timestamp = GetDateAfterMonths(BEATSAVER_EPOCH, this->hideOlderThan).count();
+        DEBUG("Date {}", GetDateAfterMonths(BEATSAVER_EPOCH, this->hideOlderThan));
 
         getPluginConfig().MinUploadDate.SetValue(timestamp);
         getPluginConfig().MinUploadDateInMonths.SetValue(this->hideOlderThan);
@@ -116,7 +100,6 @@ custom_types::Helpers::Coroutine ViewControllers::FilterViewController::_UpdateF
         int seconds = minimumSongLength * 60;
 
         filtersChanged = true;
-        DataHolder::filterOptions.minLength = seconds;
         getPluginConfig().MinLength.SetValue(seconds);
     }
 
@@ -125,7 +108,6 @@ custom_types::Helpers::Coroutine ViewControllers::FilterViewController::_UpdateF
         int seconds = maximumSongLength * 60;
 
         filtersChanged = true;
-        DataHolder::filterOptions.maxLength = seconds;
         getPluginConfig().MaxLength.SetValue(seconds);
     }
 
@@ -135,110 +117,54 @@ custom_types::Helpers::Coroutine ViewControllers::FilterViewController::_UpdateF
 
         // Save to config
         getPluginConfig().Uploaders.SetValue(this->uploadersString);
+    }
 
-        // Apply to filters
-        std::string copy = uploadersString;
-        if (copy.size() > 0) {
-            if (copy[0] == '!') {
-                copy.erase(0,1);
-                DataHolder::filterOptions.uploadersBlackList = true;
-            } else {
-                DataHolder::filterOptions.uploadersBlackList = false;
-            }
-            DataHolder::filterOptions.uploaders = split(toLower(copy), " ");
-        } else {
-            DataHolder::filterOptions.uploaders.clear();
-        }
+    if (this->onlyCuratedMaps != getPluginConfig().OnlyCuratedMaps.GetValue()) {
+        filtersChanged = true;
+        getPluginConfig().OnlyCuratedMaps.SetValue(this->onlyCuratedMaps);
     }
-    
-    std::function<std::string(StringW)> uploadersStringFormat = [](std::string value) {
-        bool blacklist = false;
-        if (value.size() > 0) {
-            if (value[0] == '!') {
-                value.erase(0,1);
-                blacklist = true;
-            }
-        } else {
-            return (std::string) "";
-        }
-        auto uploaders = split(value, " ");
 
-        return fmt::format("{} <color=#CCC>{}</color> uploader", (blacklist ? "Hiding": "Show only"), uploaders.size(), (uploaders.size() == 1 ? "" : "s") );
-    };
+    if (this->onlyVerifiedMappers != getPluginConfig().OnlyVerifiedMappers.GetValue()) {
+        filtersChanged = true;
+        getPluginConfig().OnlyVerifiedMappers.SetValue(this->onlyVerifiedMappers);
+    }
 
+    if (this->onlyV3Maps != getPluginConfig().OnlyV3Maps.GetValue()) {
+        filtersChanged = true;
+        getPluginConfig().OnlyV3Maps.SetValue(this->onlyV3Maps);
+    }
 
     if (filtersChanged) {
         DEBUG("Filters changed");
+
+        // Update filter options state
+        dataHolder.filterOptions.LoadFromConfig();
+
         auto controller = fcInstance->SongListController;
-        controller->filterChanged = true;
-        controller->SortAndFilterSongs(controller->sort, controller->search, true);
+        controller->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
     } else {
         DEBUG("Filters did not change");
     }
-
-
 }
 
-UnityEngine::Sprite* GetBGSprite(std::string str)
-{
+UnityEngine::Sprite* GetBGSprite(std::string str) {
     return UnityEngine::Resources::FindObjectsOfTypeAll<UnityEngine::Sprite*>()->First([str](UnityEngine::Sprite* x) {
         return x->get_name() == str;
     });
-
 }
 
-void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling)
-{
-    if (!firstActivation)
-        return;
-
-    // It needs to be registered
-    limitedUpdateFilterSettings = new BetterSongSearch::Util::RatelimitCoroutine([this]()
-    {
-        DEBUG("RUNNING update");
-        coro(this->_UpdateFilterSettings());
-    }, 0.2f);
-
-    INFO("Filter View contoller activated");
-
-    // Get settings and set stuff
-    this->existingSongs=this->get_downloadedFilterOptions()->get_Item((int) DataHolder::filterOptions.downloadType);
-    this->existingScore=this->get_scoreFilterOptions()->get_Item((int) DataHolder::filterOptions.localScoreType);
-    this->minimumSongLength=DataHolder::filterOptions.minLength / 60.0f;
-    this->maximumSongLength=DataHolder::filterOptions.maxLength / 60.0f;
-    this->minimumNjs = DataHolder::filterOptions.minNJS;
-    this->maximumNjs = DataHolder::filterOptions.maxNJS;
-    this->minimumNps = DataHolder::filterOptions.minNPS;
-    this->maximumNps = DataHolder::filterOptions.maxNPS;
-    this->minimumStars = DataHolder::filterOptions.minStars;
-    this->maximumStars = DataHolder::filterOptions.maxStars;
-    this->minimumRating = DataHolder::filterOptions.minRating;
-    this->minimumVotes = DataHolder::filterOptions.minVotes;
-    this->hideOlderThan = getPluginConfig().MinUploadDateInMonths.GetValue();
-
-    // Custom string loader
-    this->uploadersString = getPluginConfig().Uploaders.GetValue();
-    this->characteristic = this->get_characteristics()->get_Item((int) DataHolder::filterOptions.charFilter);
-    this->difficulty = this->get_difficulties()->get_Item((int) DataHolder::filterOptions.difficultyFilter);
-    this->rankedState = this->get_rankedFilterOptions()->get_Item((int) DataHolder::filterOptions.rankedType);
-    this->mods =  this->get_modOptions()->get_Item((int) DataHolder::filterOptions.modRequirement);
-
-    // Create bsml view
-    BSML::parse_and_construct(Assets::FilterView_bsml, this->get_transform(), this);
-
+void ViewControllers::FilterViewController::PostParse() {
     auto x = this->get_gameObject()->get_transform().cast<UnityEngine::RectTransform>();
     x->set_offsetMax(UnityEngine::Vector2(20.0f, 22.0f));
 
-    auto maxUploadDate = BetterSongSearch::GetMonthsSinceDate(FilterOptions::BEATSAVER_EPOCH);
+    auto maxUploadDate = BetterSongSearch::GetMonthsSinceDate(BEATSAVER_EPOCH);
 
     coro(BetterSongSearch::UI::Util::BSMLStuff::MergeSliders(this->get_gameObject()));
 
-
     // Apply formatter functions Manually cause Red did not implement parsing for them in bsml
-    std::function<StringW(float monthsSinceFirstUpload)> DateTimeToStr = [](float monthsSinceFirstUpload)
-    {
-        auto val = BetterSongSearch::GetTimepointAfterMonths(FilterOptions::BEATSAVER_EPOCH,monthsSinceFirstUpload);
-        return fmt::format("{:%b:%Y}", fmt::localtime(system_clock::to_time_t(val)));
+    std::function<StringW(float monthsSinceFirstUpload)> DateTimeToStr = [](float monthsSinceFirstUpload) {
+        auto val = BetterSongSearch::GetTimepointAfterMonths(BEATSAVER_EPOCH, monthsSinceFirstUpload);
+        return fmt::format("{:%b:%Y}", fmt::localtime(std::chrono::system_clock::to_time_t(val)));
     };
 
     // Update the value and set the formatter
@@ -253,35 +179,34 @@ void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bo
     auto getBgSprite = GetBGSprite("RoundRect10BorderFade");
 
     auto backgroundables = GetComponentsInChildren<BSML::Backgroundable*>();
-    for (auto & backgroundable : backgroundables) {
+    for (auto& backgroundable : backgroundables) {
         auto imageView = backgroundable->GetComponent<HMUI::ImageView*>();
-        if (!imageView || !imageView->get_color0().Equals(Color::get_white()) || imageView->get_sprite()->get_name() != "RoundRect10") {
+        if (!imageView || !imageView->get_color0().Equals(UnityEngine::Color::get_white()) || imageView->get_sprite()->get_name() != "RoundRect10") {
             continue;
         }
         imageView->____skew = 0.0f;
         imageView->set_overrideSprite(nullptr);
         imageView->set_sprite(getBgSprite);
-        imageView->set_color(Color(0.0f, 0.7f, 1.0f, 0.4f));
+        imageView->set_color(UnityEngine::Color(0.0f, 0.7f, 1.0f, 0.4f));
     }
 
     // Format other values
-    std::function<std::string(float)> minLengthSliderFormatFunction = [](float value) {
+    std::function minLengthSliderFormatFunction = [](float value) {
         float totalSeconds = value * 60;
-        int minutes = ((int)totalSeconds % 3600) / 60;
-        int seconds = (int)totalSeconds % 60;
+        int minutes = ((int) totalSeconds % 3600) / 60;
+        int seconds = (int) totalSeconds % 60;
 
         return fmt::format("{:02}:{:02}", minutes, seconds);
-        
     };
     minimumSongLengthSlider->formatter = minLengthSliderFormatFunction;
 
     // Max length format
-    std::function<std::string(float)> maxLengthSliderFormatFunction = [](float value) {
+    std::function maxLengthSliderFormatFunction = [](float value) {
         float totalSeconds = value * 60;
-        int minutes = ((int)totalSeconds % 3600) / 60;
-        int seconds = (int)totalSeconds % 60;
+        int minutes = ((int) totalSeconds % 3600) / 60;
+        int seconds = (int) totalSeconds % 60;
 
-        if (value >= DataHolder::filterOptions.SONG_LENGTH_FILTER_MAX) {
+        if (value >= SONG_LENGTH_FILTER_MAX) {
             return (std::string) "Unlimited";
         } else {
             return fmt::format("{:02}:{:02}", minutes, seconds);
@@ -290,31 +215,31 @@ void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bo
     maximumSongLengthSlider->formatter = maxLengthSliderFormatFunction;
 
     // Min rating format
-    std::function<std::string(float)> minRatingSliderFormatFunction = [](float value) {
-        return fmt::format("{:.1f}%", value*100);
+    std::function minRatingSliderFormatFunction = [](float value) {
+        return fmt::format("{:.1f}%", value * 100);
     };
     minimumRatingSlider->formatter = minRatingSliderFormatFunction;
 
     // NJS format
-    std::function<std::string(float)> minNJSFormat = [](float value) {
-            return fmt::format("{:.1f}", value);
+    std::function minNJSFormat = [](float value) {
+        return fmt::format("{:.1f}", value);
     };
-    std::function<std::string(float)> maxNJSFormat = [](float value) {
-        if (value >= DataHolder::filterOptions.NJS_FILTER_MAX) {
-            return  (std::string)  "Unlimited";
+    std::function maxNJSFormat = [](float value) {
+        if (value >= NJS_FILTER_MAX) {
+            return (std::string) "Unlimited";
         }
         return fmt::format("{:.1f}", value);
     };
     minimumNjsSlider->formatter = minNJSFormat;
     maximumNjsSlider->formatter = maxNJSFormat;
-    
+
     // NPS format
-    std::function<std::string(float)> minNPSFormat = [](float value) {
+    std::function minNPSFormat = [](float value) {
         return fmt::format("{:.1f}", value);
     };
-    std::function<std::string(float)> maxNPSFormat = [](float value) {
-        if (value >= DataHolder::filterOptions.NPS_FILTER_MAX) {
-            return  (std::string)  "Unlimited";
+    std::function maxNPSFormat = [](float value) {
+        if (value >= NPS_FILTER_MAX) {
+            return (std::string) "Unlimited";
         }
         return fmt::format("{:.1f}", value);
     };
@@ -322,18 +247,18 @@ void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bo
     maximumNpsSlider->formatter = maxNPSFormat;
 
     // Stars formatting
-    std::function<std::string(float)> minStarFormat = [](float value) {
+    std::function minStarFormat = [](float value) {
         return fmt::format("{:.1f}", value);
     };
-    std::function<std::string(float)> maxStarFormat = [](float value) {
-        if (value >= FilterOptions::STAR_FILTER_MAX) {
-            return  (std::string)  "Unlimited";
+    std::function maxStarFormat = [](float value) {
+        if (value >= STAR_FILTER_MAX) {
+            return (std::string) "Unlimited";
         }
         return fmt::format("{:.1f}", value);
     };
     minStarsSetting->formatter = minStarFormat;
     maxStarsSetting->formatter = maxStarFormat;
-    std::function<std::string(float)> minimumVotesFormat = [](float value) {
+    std::function minimumVotesFormat = [](float value) {
         return fmt::format("{}", (int) value);
     };
     minimumVotesSlider->formatter = minimumVotesFormat;
@@ -342,7 +267,7 @@ void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bo
         bool blacklist = false;
         if (value.size() > 0) {
             if (value[0] == '!') {
-                value.erase(0,1);
+                value.erase(0, 1);
                 blacklist = true;
             }
         } else {
@@ -351,11 +276,124 @@ void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bo
 
         auto uploaders = split(value, " ");
 
-        return fmt::format("{} <color=#CCC>{}</color> uploader", (blacklist ? "Hiding": "Show only"), uploaders.size(), (uploaders.size() == 1 ? "" : "s") );
+        return fmt::format(
+            "{} <color=#CCC>{}</color> uploader", (blacklist ? "Hiding" : "Show only"), uploaders.size(), (uploaders.size() == 1 ? "" : "s")
+        );
     };
-
     uploadersStringControl->formatter = uploadersStringFormat;
+    mapStyleDropdown->formatter = Formatters::FormatMapStyle;
+
+    ForceFormatValues();
+
+    // I hate BSML sometimes
+    auto m = modsRequirementDropdown->dropdown->____modalView;
+    m->get_transform().cast<UnityEngine::RectTransform>()->set_pivot(UnityEngine::Vector2(0.5f, 0.3f));
+
+    if (versionLabel) {
+        versionLabel->set_text(fmt::format("{}", VERSION));
+    }
+
+    if (mapStyleDropdown) {
+        auto c = std::min(9, this->get_mapStyles()->____size);
+        mapStyleDropdown->dropdown->____numberOfVisibleCells = c;
+        mapStyleDropdown->dropdown->ReloadData();
+        auto m = mapStyleDropdown->dropdown->____modalView;
+        m->get_transform().cast<UnityEngine::RectTransform>()->set_pivot(UnityEngine::Vector2(0.5f, 0.83f - (c * 0.041f)));
+    }
+
+    if (difficultyDropdown) {
+        auto c = std::min(9, this->get_difficulties()->____size);
+        difficultyDropdown->dropdown->____numberOfVisibleCells = c;
+        difficultyDropdown->dropdown->ReloadData();
+    }
+
+    if (characteristicDropdown) {
+        auto c = std::min(9, this->get_characteristics()->____size);
+        characteristicDropdown->dropdown->____numberOfVisibleCells = c;
+        characteristicDropdown->dropdown->ReloadData();
+        auto m = characteristicDropdown->dropdown->____modalView;
+        m->get_transform().cast<UnityEngine::RectTransform>()->set_pivot(UnityEngine::Vector2(0.5f, 0.83f - (c * 0.045f)));
+    }
+
+    if (modsRequirementDropdown) {
+        auto c = std::min(9, this->get_modOptions()->____size);
+        modsRequirementDropdown->dropdown->____numberOfVisibleCells = c;
+        modsRequirementDropdown->dropdown->ReloadData();
+        auto m = modsRequirementDropdown->dropdown->____modalView;
+        m->get_transform().cast<UnityEngine::RectTransform>()->set_pivot(UnityEngine::Vector2(0.5f, 0.0f + (c * 0.021f)));
+    }
+
+    if (rankedStateSetting) {
+        auto c = std::min(9, this->get_rankedFilterOptions()->____size);
+        rankedStateSetting->dropdown->____numberOfVisibleCells = c;
+        rankedStateSetting->dropdown->ReloadData();
+        auto m = rankedStateSetting->dropdown->____modalView;
+        m->get_transform().cast<UnityEngine::RectTransform>()->set_pivot(UnityEngine::Vector2(0.5f, 0.0f + (c * 0.011f)));
+    }
+
+    if (this->datasetInfoLabel && dataHolder.songDetails->songs.get_isDataAvailable()) {
+        std::chrono::sys_seconds timeScraped = dataHolder.songDetails->get_scrapeEndedTimeUnix();
+
+        std::time_t tt = std::chrono::system_clock::to_time_t(timeScraped);
+        std::tm local_tm = *std::localtime(&tt);
+
+        std::string timeScrapedString = fmt::format("{:%d %b %y - %H:%M}", local_tm);
+
+        this->datasetInfoLabel->set_text(fmt::format("{} songs in dataset.  Last update: {}", dataHolder.songDetails->songs.size(), timeScrapedString)
+        );
+    } else {
+        datasetInfoLabel->set_text("Loading...");
+    }
+}
+
+void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling) {
+    if (!firstActivation) {
+        return;
+    }
 
+    // Register modals
+    presetsModal = this->get_gameObject()->AddComponent<UI::Modals::Presets*>();
+    genrePickerModal = this->get_gameObject()->AddComponent<UI::Modals::GenrePicker*>();
+
+    // It needs to be registered
+    limitedUpdateFilterSettings = new BetterSongSearch::Util::RatelimitCoroutine(
+        [this]() {
+            DEBUG("RUNNING update");
+            coro(this->_UpdateFilterSettings());
+        },
+        0.2f
+    );
+
+    INFO("Filter View controller activated");
+
+    // Load the values from the config
+    UpdateLocalState();
+
+    // Create bsml view
+    BSML::parse_and_construct(Assets::FilterView_bsml, this->get_transform(), this);
+
+#ifdef HotReload
+    fileWatcher->filePath = "/sdcard/bsml/BetterSongSearch/FilterView.bsml";
+    fileWatcher->checkInterval = 0.5f;
+#endif
+}
+
+void ViewControllers::FilterViewController::UpdateGenreFilterText() {
+    // Get the current filter
+    auto [included, excluded] = dataHolder.filterOptions.CountTags();
+
+    std::string genreFilter = "Any";
+
+    if (included > 0 || excluded > 0) {
+        genreFilter = fmt::format("{} Incl. {} Excl.", included, excluded);
+    }
+
+    if (genrePickButton) {
+        genrePickButton->GetComponentInChildren<HMUI::CurvedTextMeshPro*>()->set_text(genreFilter);
+    }
+}
+
+void ViewControllers::FilterViewController::ForceFormatValues() {
     // Force format values
     FormatSliderSettingValue(this->minStarsSetting);
     FormatSliderSettingValue(this->maxStarsSetting);
@@ -368,40 +406,95 @@ void ViewControllers::FilterViewController::DidActivate(bool firstActivation, bo
     FormatSliderSettingValue(this->minimumRatingSlider);
     FormatSliderSettingValue(this->minimumVotesSlider);
     FormatStringSettingValue(this->uploadersStringControl);
-    
-    // I hate BSML some times
-    auto m = modsRequirementDropdown->dropdown->____modalView;
-    m->get_transform().cast<UnityEngine::RectTransform>()->set_pivot(UnityEngine::Vector2(0.5f, 0.3f));
 
-    #ifdef HotReload
-        fileWatcher->filePath = "/sdcard/FilterView.bsml";
-    #endif
+    UpdateGenreFilterText();
 }
 
-void ViewControllers::FilterViewController::UpdateFilterSettings()
-{
+void ViewControllers::FilterViewController::UpdateFilterSettings() {
     // We need to wait 1 frame for all the properties to get applied and then save the values?
     coro(limitedUpdateFilterSettings->CallNextFrame());
 }
 
 // Sponsors related things
-void ViewControllers::FilterViewController::OpenSponsorsModal()
-{
-    DEBUG("OpenSponsorsModal FIRED");
+void ViewControllers::FilterViewController::OpenSponsorsModal() {
+    if (this->sponsorModal) {
+        sponsorModal->Show();
+    }
 }
-void ViewControllers::FilterViewController::CloseSponsorModal()
-{
-    DEBUG("CloseSponsorModal FIRED");
+
+void ViewControllers::FilterViewController::CloseSponsorModal() {
+    if (this->sponsorModal) {
+        sponsorModal->Hide();
+    }
 }
-void ViewControllers::FilterViewController::OpenSponsorsLink()
-{
+
+void ViewControllers::FilterViewController::OpenSponsorsLink() {
     DEBUG("OpenSponsorsLink FIRED");
 }
 
+void ViewControllers::FilterViewController::ShowGenrePicker() {
+    DEBUG("ShowGenrePicker FIRED");
+    this->genrePickerModal->OpenModal();
+}
+
+void ViewControllers::FilterViewController::UpdateLocalState() {
+    // Load from dataHolder
+    this->existingSongs = this->get_downloadedFilterOptions()->get_Item((int) dataHolder.filterOptions.downloadType);
+    this->existingScore = this->get_scoreFilterOptions()->get_Item((int) dataHolder.filterOptions.localScoreType);
+    this->characteristic = this->get_characteristics()->get_Item((int) dataHolder.filterOptions.charFilter);
+    this->rankedState = this->get_rankedFilterOptions()->get_Item((int) dataHolder.filterOptions.rankedType);
+    this->difficulty = this->get_difficulties()->get_Item((int) dataHolder.filterOptions.difficultyFilter);
+    this->mods = this->get_modOptions()->get_Item((int) dataHolder.filterOptions.modRequirement);
+
+    this->minimumSongLength = dataHolder.filterOptions.minLength / 60.0f;
+    this->maximumSongLength = dataHolder.filterOptions.maxLength / 60.0f;
+    this->minimumNjs = dataHolder.filterOptions.minNJS;
+    this->maximumNjs = dataHolder.filterOptions.maxNJS;
+    this->minimumNps = dataHolder.filterOptions.minNPS;
+    this->maximumNps = dataHolder.filterOptions.maxNPS;
+    this->minimumStars = dataHolder.filterOptions.minStars;
+    this->maximumStars = dataHolder.filterOptions.maxStars;
+    this->minimumRating = dataHolder.filterOptions.minRating;
+    this->minimumVotes = dataHolder.filterOptions.minVotes;
+
+    // TODO: Maybe save it to the preset too
+    this->hideOlderThan = getPluginConfig().MinUploadDateInMonths.GetValue();
+    this->uploadersString = getPluginConfig().Uploaders.GetValue();
+
+    this->onlyCuratedMaps = getPluginConfig().OnlyCuratedMaps.GetValue();
+    this->onlyVerifiedMappers = getPluginConfig().OnlyVerifiedMappers.GetValue();
+    this->onlyV3Maps = getPluginConfig().OnlyV3Maps.GetValue();
+    this->mapStyleString = getPluginConfig().MapStyleString.GetValue();
+}
+
+void ViewControllers::FilterViewController::ForceRefreshUI() {
+    // Refresh UI
+    // Force format values
+    SetSliderSettingValue(this->minimumSongLengthSlider, this->minimumSongLength);
+    SetSliderSettingValue(this->maximumSongLengthSlider, this->maximumSongLength);
+    SetSliderSettingValue(this->minimumNjsSlider, this->minimumNjs);
+    SetSliderSettingValue(this->maximumNjsSlider, this->maximumNjs);
+    SetSliderSettingValue(this->minimumNpsSlider, this->minimumNps);
+    SetSliderSettingValue(this->maximumNpsSlider, this->maximumNps);
+    SetSliderSettingValue(this->minStarsSetting, this->minimumStars);
+    SetSliderSettingValue(this->maxStarsSetting, this->maximumStars);
+    SetSliderSettingValue(this->minimumRatingSlider, this->minimumRating);
+    SetSliderSettingValue(this->minimumVotesSlider, this->minimumVotes);
+    SetSliderSettingValue(this->hideOlderThanSlider, this->hideOlderThan);
+    SetStringSettingValue(this->uploadersStringControl, getPluginConfig().Uploaders.GetValue());
+    existingSongsSetting->set_Value(reinterpret_cast<System::String*>(this->existingSongs.convert()));
+    existingScoreSetting->set_Value(reinterpret_cast<System::String*>(this->existingScore.convert()));
+    rankedStateSetting->set_Value(reinterpret_cast<System::String*>(this->rankedState.convert()));
+    characteristicDropdown->set_Value(reinterpret_cast<System::String*>(this->characteristic.convert()));
+    difficultyDropdown->set_Value(reinterpret_cast<System::String*>(this->difficulty.convert()));
+    modsRequirementDropdown->set_Value(reinterpret_cast<System::String*>(this->mods.convert()));
+    mapStyleDropdown->set_Value(reinterpret_cast<System::String*>(this->mapStyleString.convert()));
+
+    UpdateGenreFilterText();
+}
 
 // Top buttons
-void ViewControllers::FilterViewController::ClearFilters()
-{
+void ViewControllers::FilterViewController::ClearFilters() {
     DEBUG("ClearFilters FIRED");
 
     // Reset config
@@ -411,7 +504,6 @@ void ViewControllers::FilterViewController::ClearFilters()
     getPluginConfig().RankedType.SetValue(getPluginConfig().RankedType.GetDefaultValue());
     getPluginConfig().DifficultyType.SetValue(getPluginConfig().DifficultyType.GetDefaultValue());
     getPluginConfig().RequirementType.SetValue(getPluginConfig().RequirementType.GetDefaultValue());
-
     getPluginConfig().MinLength.SetValue(getPluginConfig().MinLength.GetDefaultValue());
     getPluginConfig().MaxLength.SetValue(getPluginConfig().MaxLength.GetDefaultValue());
     getPluginConfig().MinNJS.SetValue(getPluginConfig().MinNJS.GetDefaultValue());
@@ -426,103 +518,93 @@ void ViewControllers::FilterViewController::ClearFilters()
     getPluginConfig().Uploaders.SetValue(getPluginConfig().Uploaders.GetDefaultValue());
     getPluginConfig().MinUploadDateInMonths.SetValue(getPluginConfig().MinUploadDateInMonths.GetDefaultValue());
     getPluginConfig().MinUploadDate.SetValue(getPluginConfig().MinUploadDate.GetDefaultValue());
-    
+    getPluginConfig().OnlyVerifiedMappers.SetValue(getPluginConfig().OnlyVerifiedMappers.GetDefaultValue());
+    getPluginConfig().OnlyCuratedMaps.SetValue(getPluginConfig().OnlyCuratedMaps.GetDefaultValue());
+    getPluginConfig().OnlyV3Maps.SetValue(getPluginConfig().OnlyV3Maps.GetDefaultValue());
+    getPluginConfig().MapGenreString.SetValue(getPluginConfig().MapGenreString.GetDefaultValue());
+    getPluginConfig().MapStyleString.SetValue(getPluginConfig().MapStyleString.GetDefaultValue());
+    getPluginConfig().MapGenreExcludeString.SetValue(getPluginConfig().MapGenreExcludeString.GetDefaultValue());
 
     // Load to dataHolder
-    DataHolder::filterOptions.downloadType = (FilterOptions::DownloadFilterType) getPluginConfig().DownloadType.GetValue();
-    DataHolder::filterOptions.localScoreType = (FilterOptions::LocalScoreFilterType) getPluginConfig().LocalScoreType.GetValue();
-    DataHolder::filterOptions.charFilter = (FilterOptions::CharFilterType) getPluginConfig().CharacteristicType.GetValue();
-    DataHolder::filterOptions.rankedType = (FilterOptions::RankedFilterType) getPluginConfig().RankedType.GetValue();
-    DataHolder::filterOptions.difficultyFilter = (FilterOptions::DifficultyFilterType) getPluginConfig().DifficultyType.GetValue();
-    DataHolder::filterOptions.modRequirement = (FilterOptions::RequirementType) getPluginConfig().RequirementType.GetValue();
-    DataHolder::filterOptions.minLength = getPluginConfig().MinLength.GetValue();
-    DataHolder::filterOptions.maxLength = getPluginConfig().MaxLength.GetValue();
-    DataHolder::filterOptions.minNJS = getPluginConfig().MinNJS.GetValue();
-    DataHolder::filterOptions.maxNJS = getPluginConfig().MaxNJS.GetValue();
-    DataHolder::filterOptions.minNPS = getPluginConfig().MinNPS.GetValue();
-    DataHolder::filterOptions.maxNPS = getPluginConfig().MaxNPS.GetValue();
-    DataHolder::filterOptions.minStars = getPluginConfig().MinStars.GetValue();
-    DataHolder::filterOptions.maxStars = getPluginConfig().MaxStars.GetValue();
-    DataHolder::filterOptions.minUploadDate = getPluginConfig().MinUploadDate.GetValue();
-    DataHolder::filterOptions.minRating = getPluginConfig().MinRating.GetValue();
-    DataHolder::filterOptions.minVotes = getPluginConfig().MinVotes.GetValue();
-    auto uploadersString = getPluginConfig().Uploaders.GetValue();
-    if (uploadersString.size() > 0) {
-        if (uploadersString[0] == '!') {
-            uploadersString.erase(0,1);
-            DataHolder::filterOptions.uploadersBlackList = true;
-        } else {
-            DataHolder::filterOptions.uploadersBlackList = false;
-        }
-        DataHolder::filterOptions.uploaders = split(toLower(uploadersString), " ");
-    } else {
-        DataHolder::filterOptions.uploaders.clear();
-    }
+    dataHolder.filterOptions.LoadFromConfig();
 
-    // Load to UI
-    this->existingSongs=this->get_downloadedFilterOptions()->get_Item((int) DataHolder::filterOptions.downloadType);
-    this->existingScore=this->get_scoreFilterOptions()->get_Item((int) DataHolder::filterOptions.localScoreType);
-    this->characteristic = this->get_characteristics()->get_Item((int) DataHolder::filterOptions.charFilter);
-    this->rankedState = this->get_rankedFilterOptions()->get_Item((int) DataHolder::filterOptions.rankedType);
-    this->difficulty = this->get_difficulties()->get_Item((int) DataHolder::filterOptions.difficultyFilter);
-    this->mods =  this->get_modOptions()->get_Item((int) DataHolder::filterOptions.modRequirement);
-
-    this->minimumSongLength=DataHolder::filterOptions.minLength / 60.0f;
-    this->maximumSongLength=DataHolder::filterOptions.maxLength / 60.0f;
-    this->minimumNjs = DataHolder::filterOptions.minNJS;
-    this->maximumNjs = DataHolder::filterOptions.maxNJS;
-    this->minimumNps = DataHolder::filterOptions.minNPS;
-    this->maximumNps = DataHolder::filterOptions.maxNPS;
-    this->minimumStars = DataHolder::filterOptions.minStars;
-    this->maximumStars = DataHolder::filterOptions.maxStars;
-    this->minimumRating = DataHolder::filterOptions.minRating;
-    this->minimumVotes = DataHolder::filterOptions.minVotes;
-    this->hideOlderThan = getPluginConfig().MinUploadDateInMonths.GetValue();
-    this->uploadersString = getPluginConfig().Uploaders.GetValue();
+    // Refresh FilterView state from settings and DataHolder
+    UpdateLocalState();
 
-
-    // Refresh UI
-    // Force format values
-    SetSliderSettingValue(this->minimumSongLengthSlider, this->minimumSongLength);
-    SetSliderSettingValue(this->maximumSongLengthSlider, this->maximumSongLength);
-    SetSliderSettingValue(this->minimumNjsSlider, this->minimumNjs);
-    SetSliderSettingValue(this->maximumNjsSlider, this->maximumNjs);
-    SetSliderSettingValue(this->minimumNpsSlider, this->minimumNps);
-    SetSliderSettingValue(this->maximumNpsSlider, this->maximumNps);
-    SetSliderSettingValue(this->minStarsSetting, this->minimumStars);
-    SetSliderSettingValue(this->maxStarsSetting, this->maximumStars);
-    SetSliderSettingValue(this->minimumRatingSlider, this->minimumRating);
-    SetSliderSettingValue(this->minimumVotesSlider, this->minimumVotes);
-    SetSliderSettingValue(this->hideOlderThanSlider, this->hideOlderThan);
-    SetStringSettingValue(this->uploadersStringControl, getPluginConfig().Uploaders.GetValue());
-    existingSongsSetting->set_Value(reinterpret_cast<System::String*> (this->existingSongs.convert()));
-    existingScoreSetting->set_Value(reinterpret_cast<System::String*> (this->existingScore.convert()));
-    rankedStateSetting->set_Value(reinterpret_cast<System::String*> (this->rankedState.convert()));
-    characteristicDropdown->set_Value(reinterpret_cast<System::String*> (this->characteristic.convert()));
-    difficultyDropdown->set_Value(reinterpret_cast<System::String*> (this->difficulty.convert()));
-    modsRequirementDropdown->set_Value(reinterpret_cast<System::String*> (this->mods.convert()));
+    // Force refresh UI
+    ForceRefreshUI();
 
     DEBUG("Filters changed");
     auto controller = fcInstance->SongListController;
-    controller->filterChanged = true;
-    controller->SortAndFilterSongs(controller->sort, controller->search, true);
-}
-void ViewControllers::FilterViewController::ShowPresets()
-{
-    DEBUG("ShowPresets FIRED");
+    controller->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
 }
 
-
+void ViewControllers::FilterViewController::ShowPresets() {
+    this->presetsModal->OpenModal();
+}
 
 // StringW ViewControllers::FilterViewController::DateTimeToStr(int d) {
 //     // FilterView.hideOlderThanOptions[d].ToString("MMM yyyy", CultureInfo.InvariantCulture);
 // }
-void ViewControllers::FilterViewController::TryToDownloadDataset()
-{
+void ViewControllers::FilterViewController::TryToDownloadDataset() {
     if (fcInstance) {
         if (fcInstance->SongListController) {
             fcInstance->SongListController->RetryDownloadSongList();
         }
     }
     DEBUG("TryToDownloadDataset");
-}
\ No newline at end of file
+}
+
+void ViewControllers::FilterViewController::ctor() {
+    INVOKE_CTOR();
+    DEBUG("FilterViewController ctor");
+    // Sub to events
+    dataHolder.loadingFinished += {&ViewControllers::FilterViewController::OnLoaded, this};
+    dataHolder.loadingFailed += {&ViewControllers::FilterViewController::OnFailed, this};
+    dataHolder.searchEnded += {&ViewControllers::FilterViewController::OnSearchComplete, this};
+}
+
+void ViewControllers::FilterViewController::OnDestroy() {
+    // Unsub from events
+    DEBUG("FilterViewController onDestroy");
+    dataHolder.loadingFinished -= {&ViewControllers::FilterViewController::OnLoaded, this};
+    dataHolder.loadingFailed -= {&ViewControllers::FilterViewController::OnFailed, this};
+    dataHolder.searchEnded -= {&ViewControllers::FilterViewController::OnSearchComplete, this};
+}
+
+void ViewControllers::FilterViewController::OnLoaded() {
+    INFO("Loaded dataset");
+
+    if (!dataHolder.songDetails) {
+        ERROR("SongDetails is null");
+        return;
+    }
+
+    if (!dataHolder.songDetails->songs.get_isDataAvailable()) {
+        ERROR("Data is not available somehow, bailing out");
+        return;
+    }
+
+    BSML::MainThreadScheduler::Schedule([this] {
+        std::chrono::sys_seconds timeScraped = dataHolder.songDetails->get_scrapeEndedTimeUnix();
+
+        std::time_t tt = std::chrono::system_clock::to_time_t(timeScraped);
+        std::tm local_tm = *std::localtime(&tt);
+
+        std::string timeScrapedString = fmt::format("{:%d %b %y - %H:%M}", local_tm);
+
+        this->datasetInfoLabel->set_text(fmt::format("{} songs in dataset.  Last update: {}", dataHolder.songDetails->songs.size(), timeScrapedString)
+        );
+    });
+}
+
+void ViewControllers::FilterViewController::OnFailed(std::string message) {
+    DEBUG("Failed to load dataset: {}", message);
+    BSML::MainThreadScheduler::Schedule([this, message] {
+        this->datasetInfoLabel->set_text(fmt::format("{}, click to retry", message));
+    });
+}
+
+void ViewControllers::FilterViewController::OnSearchComplete() {
+    INFO("Search complete");
+}
diff --git a/src/UI/ViewControllers/SongList.cpp b/src/UI/ViewControllers/SongList.cpp
index b499356..44c01ad 100644
--- a/src/UI/ViewControllers/SongList.cpp
+++ b/src/UI/ViewControllers/SongList.cpp
@@ -1,780 +1,90 @@
 #include "UI/ViewControllers/SongList.hpp"
 
-#include "UnityEngine/WaitForSeconds.hpp"
-#include "UnityEngine/AudioClip.hpp"
-#include "UnityEngine/AudioType.hpp"
-#include "UnityEngine/Networking/DownloadHandlerAudioClip.hpp"
-#include "UnityEngine/Networking/UnityWebRequestMultimedia.hpp"
-#include "UnityEngine/Networking/UnityWebRequest.hpp"
-#include "UnityEngine/Resources.hpp"
-#include "HMUI/NoTransitionsButton.hpp"
-#include "HMUI/InputFieldViewChangeBinder.hpp"
-#include "HMUI/CurvedTextMeshPro.hpp"
-#include "HMUI/TableView.hpp"
-#include "songcore/shared/SongCore.hpp"
-#include "GlobalNamespace/PlayerDataModel.hpp"
-#include "GlobalNamespace/PlayerData.hpp"
-#include "GlobalNamespace/PlayerLevelStatsData.hpp"
-#include "GlobalNamespace/LevelCollectionTableView.hpp"
-#include "GlobalNamespace/LevelCollectionNavigationController.hpp"
-#include "GlobalNamespace/LevelCollectionViewController.hpp"
-#include "GlobalNamespace/SongPreviewPlayer.hpp"
-#include "GlobalNamespace/SelectLevelCategoryViewController.hpp"
-#include "GlobalNamespace/LevelSelectionFlowCoordinator.hpp"
-#include "GlobalNamespace/LevelSelectionNavigationController.hpp"
-#include "System/StringComparison.hpp"
-#include "System/Nullable_1.hpp"
-#include "bsml/shared/Helpers/getters.hpp"
-#include "bsml/shared/Helpers/delegates.hpp"
-#include "bsml/shared/BSML.hpp"
-#include "fmt/fmt/include/fmt/core.h"
-#include "Util/SongUtil.hpp"
-#include <iterator>
-#include <string>
 #include <algorithm>
-#include <functional>
-#include <regex>
 #include <future>
+#include <string>
 
-#include "PluginConfig.hpp"
 #include "assets.hpp"
-#include "logging.hpp"
 #include "BeatSaverRegionManager.hpp"
+#include "bsml/shared/BSML.hpp"
+#include "bsml/shared/BSML/MainThreadScheduler.hpp"
+#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
+#include "bsml/shared/Helpers/delegates.hpp"
+#include "bsml/shared/Helpers/utilities.hpp"
+#include "DataHolder.hpp"
+#include "fmt/fmt/include/fmt/core.h"
+#include "GlobalNamespace/LevelCollectionNavigationController.hpp"
+#include "GlobalNamespace/LevelCollectionTableView.hpp"
+#include "GlobalNamespace/LevelCollectionViewController.hpp"
+#include "GlobalNamespace/LevelSelectionFlowCoordinator.hpp"
+#include "GlobalNamespace/LevelSelectionNavigationController.hpp"
+#include "GlobalNamespace/PlayerData.hpp"
+#include "GlobalNamespace/PlayerDataModel.hpp"
+#include "GlobalNamespace/SelectLevelCategoryViewController.hpp"
+#include "GlobalNamespace/SongPreviewPlayer.hpp"
+#include "HMUI/CurvedTextMeshPro.hpp"
+#include "HMUI/InputFieldViewChangeBinder.hpp"
+#include "HMUI/TableView.hpp"
+#include "logging.hpp"
+#include "PluginConfig.hpp"
+#include "songcore/shared/SongCore.hpp"
+#include "songcore/shared/SongLoader/RuntimeSongLoader.hpp"
+#include "System/Nullable_1.hpp"
+#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
+#include "UI/Manager.hpp"
+#include "UnityEngine/AudioClip.hpp"
+#include "UnityEngine/AudioType.hpp"
+#include "UnityEngine/Networking/DownloadHandlerAudioClip.hpp"
+#include "UnityEngine/Networking/UnityWebRequest.hpp"
+#include "UnityEngine/Networking/UnityWebRequestMultimedia.hpp"
+#include "UnityEngine/Resources.hpp"
+#include "UnityEngine/WaitForSeconds.hpp"
 #include "Util/BSMLStuff.hpp"
 #include "Util/CurrentTimeMs.hpp"
+#include "Util/Debug.hpp"
 #include "Util/Random.hpp"
-#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
-
-#include "UI/Manager.hpp"
+#include "Util/SongUtil.hpp"
 #include "Util/TextUtil.hpp"
-#include "Util/Debug.hpp"
-#include <cmath>
-#include "song-details/shared/SongDetails.hpp"
-#include <limits>
-#include "bsml/shared/BSML/MainThreadScheduler.hpp"
-#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
-#include "bsml/shared/Helpers/utilities.hpp"
-#include "song-details/shared/Data/RankedStates.hpp"
-
-#include "System/Collections/Generic/Dictionary_2.hpp"
 
 #define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
 
-
 using namespace BetterSongSearch::UI;
 using namespace BetterSongSearch::Util;
 using namespace BetterSongSearch::UI::Util::BSMLStuff;
 using namespace GlobalNamespace;
 using namespace SongDetailsCache;
+using namespace UnityEngine;
 
 #define SONGDOWNLOADER
 
-
-SongPreviewPlayer *songPreviewPlayer = nullptr;
-LevelCollectionViewController *levelCollectionViewController = nullptr;
+SongPreviewPlayer* songPreviewPlayer = nullptr;
+LevelCollectionViewController* levelCollectionViewController = nullptr;
 
 DEFINE_TYPE(ViewControllers::SongListController, SongListController);
 
-
-//////////// Utils
-
-
-
-const std::vector<std::string> CHAR_GROUPING = {"Unknown", "Standard", "OneSaber", "NoArrows", "Lightshow",
-                                                "NintyDegree", "ThreeSixtyDegree", "Lawless"};
-const std::vector<std::string> CHAR_FILTER_OPTIONS = {"Any", "Custom", "Standard", "One Saber", "No Arrows",
-                                                      "90 Degrees", "360 Degrees", "Lightshow", "Lawless"};
-const std::vector<std::string> DIFFS = {"Easy", "Normal", "Hard", "Expert", "Expert+"};
-const std::vector<std::string> REQUIREMENTS = {"Any", "Noodle Extensions", "Mapping Extensions", "Chroma", "Cinema"};
-
-const std::chrono::system_clock::time_point BEATSAVER_EPOCH_TIME_POINT{
-        std::chrono::seconds(FilterOptions::BEATSAVER_EPOCH)};
-
-
-std::string prevSearch;
-SortMode prevSort = (SortMode) 0;
-
-using SortFunction = std::function<float(SongDetailsCache::Song const *)>;
-
-//////////////////// UTILS //////////////////////
-bool BetterSongSearch::UI::MeetsFilter(const SongDetailsCache::Song *song) {
-    auto const &filterOptions = DataHolder::filterOptionsCache;
-    std::string songHash = song->hash();
-
-    if (filterOptions.uploaders.size() != 0) {
-        if (std::find(filterOptions.uploaders.begin(), filterOptions.uploaders.end(),
-                      removeSpecialCharacter(toLower(song->uploaderName()))) != filterOptions.uploaders.end()) {
-            if (filterOptions.uploadersBlackList)
-                return false;
-        } else if (!filterOptions.uploadersBlackList) {
-            return false;
-        }
-    }
-
-
-    if (song->uploadTimeUnix < filterOptions.minUploadDate)
-        return false;
-
-    float songRating = song->rating();
-    if (songRating < filterOptions.minRating) return false;
-
-    if (((int) song->upvotes + (int) song->downvotes) < filterOptions.minVotes) return false;
-
-    // Skip if not needed
-    if (filterOptions.localScoreType != FilterOptions::LocalScoreFilterType::All) {
-        bool hasLocalScore = false;
-        if (DataHolder::songsWithScores.contains(songHash)) {
-            hasLocalScore = true;
-        }
-        if (hasLocalScore) {
-            if (filterOptions.localScoreType == FilterOptions::LocalScoreFilterType::HidePassed)
-                return false;
-        } else {
-            if (filterOptions.localScoreType == FilterOptions::LocalScoreFilterType::OnlyPassed)
-                return false;
-        }
-    }
-
-    if (filterOptions.rankedType != FilterOptions::RankedFilterType::ShowAll) {
-        // if not the ranked that we want, skip
-        if (!hasFlags(song->rankedStates, rankMap.at(filterOptions.rankedType))) {
-            return false;
-        }
-    }
-
-    bool passesDiffFilter = true;
-
-    for (const auto &diff: *song) {
-        if (DifficultyCheck(&diff, song)) {
-            passesDiffFilter = true;
-            break;
-        } else
-            passesDiffFilter = false;
-    }
-
-    if (!passesDiffFilter)
-        return false;
-
-    if (song->songDurationSeconds < filterOptions.minLength) return false;
-    if (song->songDurationSeconds > filterOptions.maxLength) return false;
-
-
-    // This is the most heavy filter, check it last
-    if (filterOptions.downloadType != FilterOptions::DownloadFilterType::All) {
-        bool downloaded = SongCore::API::Loading::GetLevelByHash(songHash) != nullptr;
-        if (downloaded) {
-            if (filterOptions.downloadType == FilterOptions::DownloadFilterType::HideDownloaded)
-                return false;
-        } else {
-            if (filterOptions.downloadType == FilterOptions::DownloadFilterType::OnlyDownloaded)
-                return false;
-        }
-    }
-
-    return true;
-}
-
-bool BetterSongSearch::UI::DifficultyCheck(const SongDetailsCache::SongDifficulty *diff,
-                                           const SongDetailsCache::Song *song) {
-    auto const &currentFilter = DataHolder::filterOptionsCache;
-    if (currentFilter.skipFilter) {
-        return true;
-    }
-
-
-    if (currentFilter.rankedType != FilterOptions::RankedFilterType::ShowAll) {
-        // if not the ranked that we want, skip
-        if (!hasFlags(song->rankedStates, rankMap.at(currentFilter.rankedType))) {
-            return false;
-        }
-    }
-
-    // Min and max stars
-    if (currentFilter.maxStars != FilterOptions::STAR_FILTER_MAX) {
-        if (getStars(diff) > currentFilter.maxStars) {
-            return false;
-        }
-    }
-    if (currentFilter.minStars > 0) {
-        if (getStars(diff) < currentFilter.minStars) {
-            return false;
-        }
-    }
-
-    if (currentFilter.difficultyFilter != FilterOptions::DifficultyFilterType::All) {
-        if (diff->difficulty != currentFilter.difficultyFilterPreprocessed) {
-            return false;
-        }
-    }
-
-    if (currentFilter.charFilter != FilterOptions::CharFilterType::All) {
-        if (diff->characteristic != currentFilter.charFilterPreprocessed) {
-            return false;
-        }
-    }
-
-    if (diff->njs < currentFilter.minNJS || diff->njs > currentFilter.maxNJS)
-        return false;
-
-    if (currentFilter.modRequirement != FilterOptions::RequirementType::Any) {
-        switch (currentFilter.modRequirement) {
-            case FilterOptions::RequirementType::Chroma:
-                if (!hasFlags(diff->mods, MapMods::Chroma)) return false;
-                break;
-            case FilterOptions::RequirementType::Cinema:
-                if (!hasFlags(diff->mods, MapMods::Cinema)) return false;
-                break;
-            case FilterOptions::RequirementType::MappingExtensions:
-                if (!hasFlags(diff->mods, MapMods::MappingExtensions)) return false;
-                break;
-            case FilterOptions::RequirementType::NoodleExtensions:
-                if (!hasFlags(diff->mods, MapMods::NoodleExtensions)) return false;
-                break;
-            case FilterOptions::RequirementType::None:
-                if (!((diff->mods & (MapMods::NE | MapMods::ME)) == MapMods::None)) return false;
-                break;
-            default:
-                break;
-        }
-    }
-
-    if (song->songDurationSeconds > 0) {
-        float nps = (float) diff->notes / (float) song->songDurationSeconds;
-
-        if (nps < currentFilter.minNPS || nps > currentFilter.maxNPS)
-            return false;
-    }
-
-    return true;
-}
-
-
-std::unordered_map<SortMode, SortFunction> sortFunctionMap = {
-        {SortMode::Newest,        [](const SongDetailsCache::Song *x) // Newest
-                                  {
-                                      return (x->uploadTimeUnix);
-                                  }},
-        {SortMode::Oldest,        [](const SongDetailsCache::Song *x) // Oldest
-                                  {
-                                      return (std::numeric_limits<uint32_t>::max() - x->uploadTimeUnix);
-                                  }},
-        {SortMode::Latest_Ranked, [](const SongDetailsCache::Song *x) // Latest Ranked
-                                  {
-                                      return (hasFlags(x->rankedStates,
-                                                       (SongDetailsCache::RankedStates::BeatleaderRanked |
-                                                        SongDetailsCache::RankedStates::ScoresaberRanked)))
-                                             ? x->rankedChangeUnix : 0.0f;
-                                  }},
-        {SortMode::Most_Stars,    [](const SongDetailsCache::Song *x) // Most Stars
-                                  {
-                                      return x->max([x](const auto &diff) {
-                                          bool passesFilter = DifficultyCheck(&diff, x);
-                                          if (passesFilter && (getStars(&diff) > 0)) {
-                                              return getStars(&diff);
-                                          } else {
-                                              return 0.0f;
-                                          }
-                                      });
-                                  }},
-        {SortMode::Least_Stars,   [](const SongDetailsCache::Song *x) // Least Stars
-                                  {
-                                      return 420.0f - x->min([x](const auto &diff) {
-                                          bool passesFilter = DifficultyCheck(&diff, x);
-                                          if (passesFilter && (getStars(&diff) > 0)) {
-                                              return getStars(&diff);
-                                          } else {
-                                              return 420.0f;
-                                          }
-                                      });
-                                  }},
-        {SortMode::Best_rated,    [](const SongDetailsCache::Song *x) // Best rated
-                                  {
-                                      return x->rating();
-                                  }},
-        {SortMode::Worst_rated,   [](const SongDetailsCache::Song *x)//Worst rated
-                                  {
-                                      return 420.0f - (x->rating() != 0 ? x->rating() : 420.0f);
-                                  }}
+std::vector<std::string> const CHAR_GROUPING = {
+    "Unknown", "Standard", "OneSaber", "NoArrows", "Lightshow", "NintyDegree", "ThreeSixtyDegree", "Lawless"
 };
-
-struct xd {
-    const SongDetailsCache::Song *song;
-    float searchWeight;
-    float sortWeight;
+std::vector<std::string> const CHAR_FILTER_OPTIONS = {
+    "Any", "Custom", "Standard", "One Saber", "No Arrows", "90 Degrees", "360 Degrees", "Lightshow", "Lawless"
 };
+std::vector<std::string> const DIFFS = {"Easy", "Normal", "Hard", "Expert", "Expert+"};
+std::vector<std::string> const REQUIREMENTS = {"Any", "Noodle Extensions", "Mapping Extensions", "Chroma", "Cinema"};
 
 void ViewControllers::SongListController::_UpdateSearchedSongsList() {
-    DEBUG("_UpdateSearchedSongsList");
-    // Skip if not active 
-    if (!get_isActiveAndEnabled() || IsSearching) return;
-
-    // Skip if song details is null or if data is not loaded yet
-    if (DataHolder::songDetails == nullptr || !DataHolder::songDetails->songs.get_isDataAvailable()) return;
-
-    // Skip if we have no songs
-    int totalSongs = DataHolder::songDetails->songs.size();
-    if (totalSongs == 0) return;
-
-    IsSearching = true;
-
-    // Detect changes
-    bool currentFilterChanged = this->filterChanged;
-    bool currentSortChanged = prevSort != sort;
-    bool currentSearchChanged = prevSearch != search;
-
-    // Take a snapshot of current filter options
-    DataHolder::filterOptionsCache.cache(DataHolder::filterOptions);
-
-    DEBUG("SEARCHING Cache");
-    DEBUG("Sort: {}", SortToString((int) sort));
-    DEBUG("Requirement: {}", RequirementTypeToString((int) DataHolder::filterOptionsCache.modRequirement));
-    DEBUG("Char: {}", CharFilterTypeToString((int) DataHolder::filterOptionsCache.charFilter));
-    DEBUG("Difficulty: {}", DifficultyFilterTypeToString((int) DataHolder::filterOptionsCache.difficultyFilter));
-    DEBUG("Ranked: {}", RankedFilterTypeToString((int) DataHolder::filterOptionsCache.rankedType));
-    DEBUG("LocalScore: {}", LocalScoreFilterTypeToString((int) DataHolder::filterOptionsCache.localScoreType));
-    DEBUG("Download: {}", DownloadFilterTypeToString((int) DataHolder::filterOptionsCache.downloadType));
-    DEBUG("MinNJS: {}", DataHolder::filterOptionsCache.minNJS);
-    DEBUG("MaxNJS: {}", DataHolder::filterOptionsCache.maxNJS);
-    DEBUG("MinNPS: {}", DataHolder::filterOptionsCache.minNPS);
-    DEBUG("MaxNPS: {}", DataHolder::filterOptionsCache.maxNPS);
-    DEBUG("MinStars: {}", DataHolder::filterOptionsCache.minStars);
-    DEBUG("MaxStars: {}", DataHolder::filterOptionsCache.maxStars);
-    DEBUG("MinLength: {}", DataHolder::filterOptionsCache.minLength);
-    DEBUG("MaxLength: {}", DataHolder::filterOptionsCache.maxLength);
-    DEBUG("MinRating: {}", DataHolder::filterOptionsCache.minRating);
-    DEBUG("MinVotes: {}", DataHolder::filterOptionsCache.minVotes);
-    DEBUG("Uploaders number: {}", DataHolder::filterOptionsCache.uploaders.size());
-
-    this->searchInProgress->get_gameObject()->set_active(true);
-
-    DEBUG("SortAndFilterSongs runs");
-    if (songListTable() != nullptr) {
-        songListTable()->ClearSelection();
-        songListTable()->ClearHighlights();
-    }
-
-
-    // Grab current values for sort and search
-    auto currentSort = sort;
-    // Current search (processed)
-    auto currentSearch = toLower(search);
-
-    // Save for debugging
-    DataHolder::currentSort = sort;
-    DataHolder::currentSearch = search;
-
-    // Reset values
-    prevSort = sort;
-    prevSearch = search;
-    this->filterChanged = false;
-
-    std::thread([this, currentSearch, currentSort, currentFilterChanged, currentSortChanged, currentSearchChanged] {
-        long long before = CurrentTimeMs();
-
-
-        // TODO: Actually update the scores
-        // Get scores if we don't have them
-        if (DataHolder::songsWithScores.size() == 0) {
-            if (DataHolder::playerDataModel) {
-                auto statsData = DataHolder::playerDataModel->get_playerData()->get_levelsStatsData();
-                auto statsDataEnumerator = statsData->GetEnumerator();
-
-                while (statsDataEnumerator.MoveNext()) {
-                    auto statsDataKeys = statsDataEnumerator.get_Current();
-                    auto x = statsDataKeys.value;
-
-                    if (!x->get_validScore() || x->get_highScore() == 0 || x->get_levelID()->get_Length() < 13 + 40)
-                        continue;
-                    std::u16string_view levelid = x->get_levelID();
-                    if (!levelid.starts_with(u"custom_level_")) {
-                        continue;
-                    };
-                    auto sh = std::regex_replace((std::string) x->get_levelID(), std::basic_regex("custom_level_"), "");
-
-                    auto &song = DataHolder::songDetails->songs.FindByHash(sh);
-
-                    if (song == SongDetailsCache::Song::none)
-                        continue;
-
-                    bool foundDiff = false;
-
-                    for (auto &diff: song) {
-                        if (diff.difficulty == SongDetailsCache::MapDifficulty((int) x->____difficulty.value__)) {
-                            foundDiff = true;
-                            break;
-                        }
-                    }
-                    if (!foundDiff) continue;
-
-                    DataHolder::songsWithScores.insert(sh);
-                }
-                INFO("local scores checked. found {}", DataHolder::songsWithScores.size());
-            }
-            INFO("Checked local scores in {} ms", CurrentTimeMs() - before);
-        }
-
-        // 4 threads are fine
-        const int num_threads = 4;
-        std::thread t[num_threads];
-
-        // Filter songs if needed
-        if (currentFilterChanged) {
-            DEBUG("Filtering");
-            int totalSongs = DataHolder::songDetails->songs.size();
-            DataHolder::filteredSongList.clear();
-            if (DataHolder::filterOptionsCache.skipFilter) {
-                DEBUG("Filtering skipped");
-                DataHolder::filteredSongList.reserve(totalSongs);
-                for (auto &song: DataHolder::songDetails->songs) {
-                    DataHolder::filteredSongList.push_back(&song);
-                }
-            } else {
-                // Set up variables for threads
-                std::mutex valuesMutex;
-                std::atomic_int index = 0;
-
-                //Launch a group of threads
-                for (int i = 0; i < num_threads; ++i) {
-                    t[i] = std::thread([&index, &valuesMutex, totalSongs]() {
-                        int i = index++;
-                        while (i < totalSongs) {
-                            const SongDetailsCache::Song &item = DataHolder::songDetails->songs.at(i);
-                            bool meetsFilter = MeetsFilter(&item);
-                            if (meetsFilter) {
-                                std::lock_guard<std::mutex> lock(valuesMutex);
-                                DataHolder::filteredSongList.push_back(&item);
-                            }
-                            i = index++;
-                        }
-                    });
-                }
-
-
-                //Join the threads with the main thread
-                for (int i = 0; i < num_threads; ++i) { t[i].join(); }
-            }
-
-        }
-
-        INFO("Filtered in {} ms", CurrentTimeMs() - before);
-
-
-        if (currentFilterChanged || currentSearchChanged || currentSortChanged) {
-            if (currentSearch.length() > 0) {
-                auto words = split(currentSearch, " ");
-                DEBUG("Words length {}", words.size());
-                for (int i = 0; i < words.size(); i++) {
-                    DEBUG("Search term: '{}'", words[i]);
-                };
-
-                // TODO: Process song key
-                uint32_t possibleSongKey = 0;
-                // Try to parse song key if 1 word from 2 to 7 letters
-                if (words.size() == 1 && currentSearch.length() >= 2 && currentSearch.length() <= 7) {
-                    try {
-                        possibleSongKey = static_cast<uint32_t>(std::stoul(currentSearch, nullptr, 16));
-                    } catch (...) {}
-                }
-
-                float maxSearchWeight = 0.0f;
-                float maxSortWeight = 0.0f;
-
-                DEBUG("Searching");
-                long long before = CurrentTimeMs();
-                DataHolder::searchedSongList.clear();
-                // Set up variables for threads
-                int totalSongs = DataHolder::filteredSongList.size();
-
-                std::mutex valuesMutex;
-                std::atomic_int index = 0;
-
-                // Prefiltered songs
-                std::vector<xd> prefiltered;
-
-                //Launch a group of threads
-                for (int i = 0; i < num_threads; ++i) {
-                    t[i] = std::thread(
-                            [&index, &valuesMutex, totalSongs, currentSearch, words, &prefiltered, &maxSearchWeight, &maxSortWeight, currentSort, possibleSongKey](
-                                    std::vector<std::string> searchQuery) {
-
-                                int j = index++;
-                                while (j < totalSongs) {
-                                    auto songe = DataHolder::filteredSongList[j];
-
-                                    float resultWeight = 0;
-                                    bool matchedAuthor = false;
-                                    int prevMatchIndex = -1;
-
-
-                                    std::string songName = removeSpecialCharacter(toLower(songe->songName()));
-                                    std::string songAuthorName = removeSpecialCharacter(
-                                            toLower(songe->songAuthorName()));
-                                    std::string levelAuthorName = removeSpecialCharacter(
-                                            toLower(songe->levelAuthorName()));
-                                    uint32_t songKey = songe->mapId();
-
-                                    // If song key is present and mapid == songkey, pull it to the top
-                                    if (possibleSongKey != 0 && songKey == possibleSongKey)
-                                        resultWeight = 30;
-
-                                    // Find full match author name
-                                    int authorFullMatch = currentSearch.find(songAuthorName);
-
-                                    // set up i for the loop
-                                    int i = 0;
-
-                                    if (songAuthorName.length() > 4 && authorFullMatch != std::string::npos &&
-                                        // Checks if there is a space after the supposedly matched author name
-                                        (currentSearch.length() == songAuthorName.length() ||
-                                         IsSpace(currentSearch[songAuthorName.length()]))
-                                            ) {
-                                        matchedAuthor = true;
-                                        resultWeight += songAuthorName.length() > 5 ? 25 : 20;
-
-                                        // If the author is matched and is the first, then skip first word (i + 1)
-                                        // This is super cheapskate - I'd have to replace the author from the filter and recreate the words array otherwise
-                                        if (authorFullMatch == 0)
-                                            i = 1;
-                                    }
-
-                                    // Go over a list of words
-                                    for (; i < words.size(); i++) {
-                                        // If the word matches the author 1:1 thats cool innit
-                                        // If author name is not empty
-                                        if (songAuthorName.length() != 0) {
-                                            // If not matched author and author name == word then add weight, skip if author is already matched
-                                            if (!matchedAuthor && songAuthorName == words[i]) {
-                                                matchedAuthor = true;
-                                                // 3*length of the word divided by 2? wtf
-                                                resultWeight += 3 * (words[i].length() / 2);
-
-                                                // Go to next word
-                                                continue;
-                                                // Otherwise we'll have to check if its contained within this word
-                                            } else if (!matchedAuthor && words[i].length() >= 3) {
-                                                int index = songAuthorName.find(words[i]);
-
-                                                // If found in the beginning or is space at the end of author name which means we matched the beginning of a word
-                                                if (index == 0 || (index > 0 && IsSpace(songAuthorName[index - 1]))) {
-
-                                                    matchedAuthor = true;
-                                                    // Add weight
-                                                    resultWeight += (int) round((index == 0 ? 4.0f : 3.0f) *
-                                                                                ((float) words[i].length() /
-                                                                                 songAuthorName.length()));
-                                                    continue;
-                                                }
-                                            }
-                                        }
-
-                                        int matchpos = songName.find(words[i]);
-                                        if (matchpos != std::string::npos) {
-                                            // Check if we matched the beginning of a word
-                                            bool wordStart = matchpos == 0 || songName[matchpos - 1] == ' ';
-
-                                            // If it was the beginning add 5 weighting, else 3
-                                            resultWeight += wordStart ? 5 : 3;
-
-
-                                            ///////////////// New algo  /////////////////////////
-                                            // Find the position in the name
-                                            int posInName = matchpos + words[i].length();
-
-                                            /*
-                                            * Check if we are at the end of the song name, but only if it has at least 8 characters
-                                            * We do this because otherwise, when searching for "lowermost revolt", songs where the
-                                            * songName is exactly "lowermost revolt" would have a lower result weight than
-                                            * "lowermost revolt (JoeBama cover)"
-                                            *
-                                            * The 8 character limitation for this is so that super short words like "those" dont end
-                                            * up triggering this
-                                            */
-                                            if (songName.length() > 7 && songName.length() == posInName) {
-                                                resultWeight += 3;
-                                            } else {
-                                                // If we did match the beginning, check if we matched an entire word. Get the end index as indicated by our needle
-                                                bool maybeWordEnd = wordStart && posInName < songName.length();
-
-                                                // Check if we actually end up at a non word char, if so add 2 weighting
-                                                if (maybeWordEnd && songName[matchpos + words[i].length()] == ' ')
-                                                    resultWeight += 2;
-                                            }
-                                            /////////////////////////////////////////////////////
-
-                                            //// Old algo for testing pc compatibility (comment out new algo and uncomment this for comparison with PC) //////////
-                                            // bool maybeWordEnd = wordStart && matchpos + words[i].length() < songName.length();
-
-                                            // // Check if we actually end up at a non word char, if so add 2 weighting
-                                            // if(maybeWordEnd && songName[matchpos + words[i].length()] == ' ')
-                                            //     resultWeight += 2;
-                                            ////////////////////////////////////////////////////
-
-
-                                            // If the word we just checked is behind the previous matched, add another 1 weight
-                                            if (prevMatchIndex != -1 && matchpos > prevMatchIndex)
-                                                resultWeight += 1;
-
-                                            prevMatchIndex = matchpos;
-                                        }
-                                    }
-
-                                    for (i = 0; i < words.size(); i++) {
-                                        if (words[i].length() > 3 &&
-                                            levelAuthorName.find(words[i]) != std::string::npos) {
-                                            resultWeight += 1;
-
-                                            break;
-                                        }
-                                    }
-
-                                    if (resultWeight > 0) {
-                                        float sortWeight = sortFunctionMap.at(currentSort)(songe);
-
-                                        std::lock_guard<std::mutex> lock(valuesMutex);
-
-                                        prefiltered.push_back({
-                                                                      songe, resultWeight, sortWeight
-                                                              });
-
-                                        // #if DEBUG
-                                        //                         x.sortWeight = sortWeight;
-                                        //                         x.resultWeight = resultWeight;
-                                        // #endif
-                                        if (maxSearchWeight < resultWeight)
-                                            maxSearchWeight = resultWeight;
-
-                                        if (maxSortWeight < sortWeight)
-                                            maxSortWeight = sortWeight;
-                                    }
-                                    j = index++;
-                                }
-                            }, words);
-                }
-
-                //Join the threads with the main thread
-                for (int i = 0; i < num_threads; ++i) { t[i].join(); }
-
-                INFO("Calculated search indexes in {} ms", CurrentTimeMs() - before);
-                if (prefiltered.size() == 0) {
-                    DataHolder::searchedSongList.clear();
-                } else {
-                    long long before = CurrentTimeMs();
-                    float maxSearchWeightInverse = 1.0f / maxSearchWeight;
-                    float maxSortWeightInverse = 1.0f / maxSortWeight;
-
-                    // Calculate total search weight
-                    for (auto &item: prefiltered) {
-                        float searchWeight = item.searchWeight * maxSearchWeightInverse;
-                        item.searchWeight = searchWeight + min(searchWeight / 2,
-                                                               item.sortWeight * maxSortWeightInverse *
-                                                               (searchWeight / 2));
-                    }
-
-                    std::stable_sort(prefiltered.begin(), prefiltered.end(),
-                                     [](const xd &s1, const xd &s2) {
-                                         return s1.searchWeight > s2.searchWeight;
-                                     }
-                    );
-
-                    DataHolder::searchedSongList.reserve(prefiltered.size());
-                    for (auto &x: prefiltered) {
-                        DataHolder::searchedSongList.push_back(x.song);
-                    }
-                    INFO("sorted search results in {} ms", CurrentTimeMs() - before);
-                }
-            } else {
-                long long before = CurrentTimeMs();
-
-                std::vector<xd> prefiltered;
-                auto sortFunction = sortFunctionMap.at(currentSort);
-                for (auto item: DataHolder::filteredSongList) {
-                    auto score = sortFunction(item);
-                    prefiltered.push_back({
-                                                  item, 0, score
-                                          });
-                }
-
-                std::stable_sort(
-                        prefiltered.begin(),
-                        prefiltered.end(),
-                        [](const xd &s1, const xd &s2) {
-                            return s1.sortWeight > s2.sortWeight;
-                        }
-                );
-
-                DataHolder::searchedSongList.clear();
-                DataHolder::searchedSongList.reserve(DataHolder::filteredSongList.size());
-
-                // Push to searched
-                for (auto &x: prefiltered) {
-                    DataHolder::searchedSongList.push_back(x.song);
-                }
-
-                INFO("Sort without search in {} ms", CurrentTimeMs() - before);
-            }
-        }
-
-
-        DEBUG("Search time: {}ms", CurrentTimeMs() - before);
-        BSML::MainThreadScheduler::Schedule([this] {
-            long long before = 0;
-            before = CurrentTimeMs();
-
-            // Copy the list to the displayed one
-            DataHolder::sortedSongList.clear();
-            DataHolder::sortedSongList = DataHolder::searchedSongList;
-            this->ResetTable();
-
-            INFO("table reset in {} ms", CurrentTimeMs() - before);
-
-            if (songSearchPlaceholder) {
-                if (DataHolder::filteredSongList.size() == DataHolder::songDetails->songs.size()) {
-                    songSearchPlaceholder->set_text("Search by Song, Key, Mapper..");
-                } else {
-                    songSearchPlaceholder->set_text(
-                            fmt::format("Search {} songs", DataHolder::filteredSongList.size()));
-                }
-            }
-            if (!currentSong) {
-                SelectSong(songListTable(), 0);
-            } else {
-                // Always un-select in the list to prevent wrong-selections on resorting, etc.
-                songListTable()->ClearSelection();
-            }
-
-            this->searchInProgress->get_gameObject()->set_active(false);
-
-
-            // Run search again if something wants to
-            bool currentSortChanged = prevSort != sort;
-            bool currentSearchChanged = prevSearch != search;
-            bool currentFilterChanged = this->filterChanged;
-
-            IsSearching = false;
-
-            // Queue another search at the end of this one
-            if (currentSearchChanged || currentSortChanged || currentFilterChanged) {
-                this->UpdateSearchedSongsList();
-            }
-        });
-    }).detach();
+    dataHolder.Search();
 }
 
 void ViewControllers::SongListController::UpdateSearchedSongsList() {
-    this->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(
-            limitedUpdateSearchedSongsList->CallNextFrame()
-    ));
+    this->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(limitedUpdateSearchedSongsList->CallNextFrame()));
 }
 
 void ViewControllers::SongListController::PostParse() {
     // Steal search box from the base game
-    static UnityW<HMUI::InputFieldView> gameSearchBox;
-    if (!gameSearchBox) {
-        gameSearchBox = Resources::FindObjectsOfTypeAll<HMUI::InputFieldView *>()->First(
-                [](HMUI::InputFieldView *x) {
-                    return x->get_name() == "SearchInputField";
-                });
-    }
+    UnityW<HMUI::InputFieldView> gameSearchBox;
+    gameSearchBox = Resources::FindObjectsOfTypeAll<HMUI::InputFieldView*>()->First([](HMUI::InputFieldView* x) {
+        return x->get_name() == "SearchInputField";
+    });
 
     if (gameSearchBox) {
         DEBUG("Found search box");
@@ -783,16 +93,15 @@ void ViewControllers::SongListController::PostParse() {
             UnityEngine::Object::DestroyImmediate(searchBox);
         }
         searchBox = Instantiate(gameSearchBox->get_gameObject(), searchBoxContainer->get_transform(), false);
-        auto songSearchInput = searchBox->GetComponent<HMUI::InputFieldView *>();
-        songSearchPlaceholder = searchBox->get_transform()->Find(
-                "PlaceholderText")->GetComponent<HMUI::CurvedTextMeshPro *>();
+        UnityW<HMUI::InputFieldView> songSearchInput = searchBox->GetComponent<HMUI::InputFieldView*>();
+        songSearchPlaceholder = searchBox->get_transform()->Find("PlaceholderText")->GetComponent<HMUI::CurvedTextMeshPro*>();
         songSearchPlaceholder->set_text("Search by Song, Key, Mapper..");
         songSearchInput->____keyboardPositionOffset = Vector3(-15, -36, 0);
+        songSearchInput->set_text("");  // Clear the text
 
-        std::function<void(UnityW<HMUI::InputFieldView> view)> onValueChanged = [this](
-                UnityW<HMUI::InputFieldView> view) {
+        std::function<void(UnityW<HMUI::InputFieldView> view)> onValueChanged = [this](UnityW<HMUI::InputFieldView> view) {
             DEBUG("Input is: {}", (std::string) view->get_text());
-            this->SortAndFilterSongs(this->sort, (std::string) view->get_text(), true);
+            this->SortAndFilterSongs(dataHolder.sort, (std::string) view->get_text(), true);
         };
 
         songSearchInput->get_onValueChanged()->AddListener(BSML::MakeUnityAction(onValueChanged));
@@ -803,15 +112,17 @@ void ViewControllers::SongListController::PostParse() {
     // Set default cover image
     coverImage->set_sprite(defaultImage);
 
-    // Get song preview player 
-    songPreviewPlayer = UnityEngine::Resources::FindObjectsOfTypeAll<SongPreviewPlayer *>()->FirstOrDefault();
-    levelCollectionViewController = UnityEngine::Resources::FindObjectsOfTypeAll<LevelCollectionViewController *>()->FirstOrDefault();
+    // Get song preview player
+    songPreviewPlayer = UnityEngine::Resources::FindObjectsOfTypeAll<SongPreviewPlayer*>()->FirstOrDefault();
+    levelCollectionViewController = UnityEngine::Resources::FindObjectsOfTypeAll<LevelCollectionViewController*>()->FirstOrDefault();
 
-    // BSML has a bug that stops getting the correct platform helper and on game reset it dies and the scrollhelper stays invalid and scroll doesn't work
-    auto platformHelper = Resources::FindObjectsOfTypeAll<LevelCollectionTableView *>()->First()->GetComponentInChildren<HMUI::ScrollView *>()->____platformHelper;
+    // BSML has a bug that stops getting the correct platform helper and on game reset it dies and the scrollhelper stays invalid and scroll doesn't
+    // work
+    auto platformHelper =
+        Resources::FindObjectsOfTypeAll<LevelCollectionTableView*>()->First()->GetComponentInChildren<HMUI::ScrollView*>()->____platformHelper;
     if (platformHelper == nullptr) {
     } else {
-        for (auto x: this->GetComponentsInChildren<HMUI::ScrollView *>()) {
+        for (auto x : this->GetComponentsInChildren<HMUI::ScrollView*>()) {
             x->____platformHelper = platformHelper;
         }
     }
@@ -822,97 +133,103 @@ void ViewControllers::SongListController::PostParse() {
     sortDropdown->dropdown->ReloadData();
     auto m = sortDropdown->dropdown->____modalView;
     m->get_transform().cast<RectTransform>()->set_pivot(UnityEngine::Vector2(0.5f, 0.83f + (c * 0.011f)));
+
+    if (this->songList) {
+        songList->tableView->SetDataSource(reinterpret_cast<HMUI::TableView::IDataSource*>(this), false);
+    }
 }
 
-void ViewControllers::SongListController::DidActivate(bool firstActivation, bool addedToHeirarchy,
-                                                      bool screenSystemDisabling) {
-    fromBSS = false;
+void ViewControllers::SongListController::DidActivate(bool firstActivation, bool addedToHeirarchy, bool screenSystemDisabling) {
+    // Init everything before we call events
+    if (firstActivation) {
+        DEBUG("SongListController first activation");
+        if (dataHolder.playerDataModel == nullptr) {
+            dataHolder.playerDataModel = UnityEngine::GameObject::FindObjectOfType<GlobalNamespace::PlayerDataModel*>();
+        };
 
-    // Retry if failed to dl
-    this->RetryDownloadSongList();
+        // Get coordinators
+        soloFreePlayFlowCoordinator = UnityEngine::Object::FindObjectOfType<SoloFreePlayFlowCoordinator*>();
+        multiplayerLevelSelectionFlowCoordinator = UnityEngine::Object::FindObjectOfType<MultiplayerLevelSelectionFlowCoordinator*>();
 
-    // If needs a refresh, refresh when shown
-    if (DataHolder::loaded && DataHolder::needsRefresh) {
-        // Initial search
-        this->filterChanged = true;
-        fcInstance->SongListController->SortAndFilterSongs(this->sort, this->search, true);
-        fcInstance->FilterViewController->datasetInfoLabel->set_text(
-                fmt::format("{} songs in dataset ", DataHolder::songDetails->songs.size()));
-    }
+        // Get regional beat saver urls
+        BeatSaverRegionManager::RegionLookup();
 
-    // Restore search songs count
-    if (DataHolder::loaded && !DataHolder::failed && songSearchPlaceholder) {
-        if (DataHolder::filteredSongList.size() < DataHolder::songDetails->songs.size()) {
-            songSearchPlaceholder->set_text(fmt::format("Search {} songs", DataHolder::filteredSongList.size()));
-        } else {
-            songSearchPlaceholder->set_text("Search by Song, Key, Mapper..");
-        }
-    }
+        limitedUpdateSearchedSongsList = new BetterSongSearch::Util::RatelimitCoroutine(
+            [this]() {
+                DEBUG("UpdateSearchedSongsList limited called");
+                this->_UpdateSearchedSongsList();
+            },
+            0.1f
+        );
 
-    if (!firstActivation)
-        return;
+        IsSearching = false;
+        INFO("Song list contoller activated");
 
-    if (DataHolder::playerDataModel == nullptr) {
-        DataHolder::playerDataModel = UnityEngine::GameObject::FindObjectOfType<GlobalNamespace::PlayerDataModel *>();
-    };
-    // Get coordinators
-    soloFreePlayFlowCoordinator = UnityEngine::Object::FindObjectOfType<SoloFreePlayFlowCoordinator *>();
-    multiplayerLevelSelectionFlowCoordinator = UnityEngine::Object::FindObjectOfType<MultiplayerLevelSelectionFlowCoordinator *>();
+        // Get sort setting from config
+        auto sortMode = getPluginConfig().SortMode.GetValue();
+        if (sortMode < get_sortModeSelections()->get_Count()) {
+            selectedSortMode = get_sortModeSelections()->get_Item(sortMode);
+            dataHolder.sort = (FilterTypes::SortMode) sortMode;
+        }
 
-    // Get regional beat saver urls
-    BeatSaverRegionManager::RegionLookup();
+        BSML::parse_and_construct(Assets::SongList_bsml, this->get_transform(), this);
 
-    limitedUpdateSearchedSongsList = new BetterSongSearch::Util::RatelimitCoroutine([this]() {
-        DEBUG("UpdateSearchedSongsList limited called");
-        this->_UpdateSearchedSongsList();
-    }, 0.1f);
+        multiDlModal = this->get_gameObject()->AddComponent<UI::Modals::MultiDL*>();
+        settingsModal = this->get_gameObject()->AddComponent<UI::Modals::Settings*>();
+        uploadDetailsModal = this->get_gameObject()->AddComponent<UI::Modals::UploadDetails*>();
 
-    IsSearching = false;
-    INFO("Song list contoller activated");
+        // If loaded, refresh
+        if (dataHolder.loaded) {
+            DEBUG("Loaded is true");
+            // Initial search
+            dataHolder.forceReload = true;
+            fcInstance->SongListController->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
+            fcInstance->FilterViewController->datasetInfoLabel->set_text(fmt::format("{} songs in dataset ", dataHolder.songDetails->songs.size()));
+        } else {
+            this->DownloadSongList();
+        }
 
-    // Get sort setting from config
-    auto sortMode = getPluginConfig().SortMode.GetValue();
-    if (sortMode < get_sortModeSelections()->get_Count()) {
-        selectedSortMode = get_sortModeSelections()->get_Item(sortMode);
-        sort = (SortMode) sortMode;
+#ifdef HotReload
+        fileWatcher->filePath = "/sdcard/bsml/BetterSongSearch/SongList.bsml";
+        fileWatcher->checkInterval = 0.5f;
+#endif
     }
+    // End first activation
 
-    BSML::parse_and_construct(Assets::SongList_bsml, this->get_transform(), this);
+    dataHolder.UpdatePlayerScores();
 
-    if (this->songList) {
-        INFO("Table exists");
-        songList->tableView->SetDataSource(reinterpret_cast<HMUI::TableView::IDataSource *>(this), false);
-    }
+    fromBSS = false;
 
-    multiDlModal = this->get_gameObject()->AddComponent<UI::Modals::MultiDL *>();
-    settingsModal = this->get_gameObject()->AddComponent<UI::Modals::Settings *>();
-    uploadDetailsModal = this->get_gameObject()->AddComponent<UI::Modals::UploadDetails *>();
+    // Retry if failed to dl
+    this->RetryDownloadSongList();
 
-    // If loaded, refresh
-    if (DataHolder::loaded) {
-        DEBUG("Loaded is true");
+    // If needs a refresh, start a new search when activated
+    if (dataHolder.needsRefresh) {
         // Initial search
-        this->filterChanged = true;
-        fcInstance->SongListController->SortAndFilterSongs(this->sort, this->search, true);
-        fcInstance->FilterViewController->datasetInfoLabel->set_text(
-                fmt::format("{} songs in dataset ", DataHolder::songDetails->songs.size()));
-    } else {
-        this->DownloadSongList();
+        dataHolder.needsRefresh = false;  // Clear the flag
+        dataHolder.forceReload = true;
+        fcInstance->SongListController->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
+        fcInstance->FilterViewController->datasetInfoLabel->set_text(fmt::format("{} songs in dataset ", dataHolder.songDetails->songs.size()));
     }
 
-#ifdef HotReload
-    fileWatcher->filePath = "/sdcard/SongList.bsml";
-#endif
+    // Restore search songs count
+    if (dataHolder.loaded && !dataHolder.failed && songSearchPlaceholder) {
+        if (dataHolder.filteredSongList.size() < dataHolder.songDetails->songs.size()) {
+            songSearchPlaceholder->set_text(fmt::format("Search {} songs", dataHolder.filteredSongList.size()));
+        } else {
+            songSearchPlaceholder->set_text("Search by Song, Key, Mapper..");
+        }
+    }
 }
 
 void ViewControllers::SongListController::SelectSongByHash(std::string hash) {
-    if (DataHolder::songDetails == nullptr) {
+    if (dataHolder.songDetails == nullptr) {
         DEBUG("Song details is not loaded yet");
         return;
     }
 
     DEBUG("Song hash: {}", hash);
-    auto &song = DataHolder::songDetails->songs.FindByHash(hash);
+    auto& song = dataHolder.songDetails->songs.FindByHash(hash);
     if (song == SongDetailsCache::Song::none) {
         DEBUG("Uh oh, you somehow downloaded a song that was only a figment of your imagination");
         return;
@@ -921,19 +238,18 @@ void ViewControllers::SongListController::SelectSongByHash(std::string hash) {
     SetSelectedSong(&song);
 }
 
-
 void ViewControllers::SongListController::SelectSong(UnityW<HMUI::TableView> table, int id) {
-    if (!table)
+    if (!table) {
         return;
+    }
     DEBUG("Cell clicked {}", id);
-    if (DataHolder::sortedSongList.size() <= id) {
+    if (dataHolder.displayedSongList.size() <= id) {
         // Return if the id is invalid
         return;
     }
-    auto song = DataHolder::sortedSongList[id];
+    auto song = dataHolder.displayedSongList[id];
     DEBUG("Selecting song {}", id);
     this->SetSelectedSong(song);
-
 }
 
 float ViewControllers::SongListController::CellSize() {
@@ -943,32 +259,37 @@ float ViewControllers::SongListController::CellSize() {
 }
 
 void ViewControllers::SongListController::ResetTable() {
-
     if (songListTable() != nullptr) {
-        DEBUG("Songs size: {}", DataHolder::sortedSongList.size());
-        DEBUG("TABLE RESET");
         songListTable()->ReloadData();
         songListTable()->ScrollToCellWithIdx(0, HMUI::TableView::ScrollPositionType::Beginning, false);
     }
 }
 
 int ViewControllers::SongListController::NumberOfCells() {
-    return DataHolder::sortedSongList.size();
+    return dataHolder.displayedSongList.size();
 }
 
 void ViewControllers::SongListController::ctor() {
+    DEBUG("SongListController ctor");
     INVOKE_CTOR();
     selectedSortMode = StringW("Newest");
 
     // Sub to events
-    SongDetailsCache::SongDetails::dataAvailableOrUpdated += {&ViewControllers::SongListController::SongDataDone, this};
-    SongDetailsCache::SongDetails::dataLoadFailed += {&ViewControllers::SongListController::SongDataError, this};
+    dataHolder.loadingFinished += {&ViewControllers::SongListController::SongDataDone, this};
+    dataHolder.loadingFailed += {&ViewControllers::SongListController::SongDataError, this};
+    dataHolder.searchEnded += {&ViewControllers::SongListController::SearchDone, this};
+    dataHolder.playerDataLoaded += {&ViewControllers::SongListController::PlayerDataLoaded, this};
+
+    SongCore::SongLoader::RuntimeSongLoader::get_instance()->SongsLoaded += {&SongListController::OnSongsLoaded, this};
 }
 
-void ViewControllers::SongListController::dtor() {
+void ViewControllers::SongListController::OnDestroy() {
+    DEBUG("SongListController onDestroy");
     // Unsub from events
-    SongDetailsCache::SongDetails::dataAvailableOrUpdated -= {&ViewControllers::SongListController::SongDataDone, this};
-    SongDetailsCache::SongDetails::dataLoadFailed -= {&ViewControllers::SongListController::SongDataError, this};
+    dataHolder.loadingFinished -= {&ViewControllers::SongListController::SongDataDone, this};
+    dataHolder.loadingFailed -= {&ViewControllers::SongListController::SongDataError, this};
+    dataHolder.searchEnded -= {&ViewControllers::SongListController::SearchDone, this};
+    dataHolder.playerDataLoaded -= {&ViewControllers::SongListController::PlayerDataLoaded, this};
 }
 
 void ViewControllers::SongListController::SelectRandom() {
@@ -1009,28 +330,27 @@ void ViewControllers::SongListController::ForcedUICloseCancel() {
 
 custom_types::Helpers::Coroutine ViewControllers::SongListController::UpdateDataAndFiltersCoro() {
     // Wait
-    co_yield reinterpret_cast<System::Collections::IEnumerator *>(UnityEngine::WaitForSeconds::New_ctor(0.1f));
+    co_yield reinterpret_cast<System::Collections::IEnumerator*>(UnityEngine::WaitForSeconds::New_ctor(0.1f));
 
     // WARNING: There is a bug with bsml update, it runs before the value is changed for some reason
     bool filtersChanged = false;
 
-
-    SortMode sort = prevSort;
+    FilterTypes::SortMode sort = dataHolder.sort;
     if (selectedSortMode != nullptr) {
-        int index = get_sortModeSelections()->IndexOf(reinterpret_cast<System::String *> (selectedSortMode.convert()));
-        if (index < 0) {}
-        else {
+        int index = get_sortModeSelections()->IndexOf(reinterpret_cast<System::String*>(selectedSortMode.convert()));
+        if (index < 0) {
+        } else {
             if (index != getPluginConfig().SortMode.GetValue()) {
                 filtersChanged = true;
                 getPluginConfig().SortMode.SetValue(index);
-                sort = (SortMode) index;
+                sort = (FilterTypes::SortMode) index;
             }
         }
     }
 
     if (filtersChanged) {
         DEBUG("Sort changed");
-        this->SortAndFilterSongs(sort, this->prevSearch, true);
+        this->SortAndFilterSongs(sort, dataHolder.search, true);
     }
 }
 
@@ -1039,7 +359,6 @@ void ViewControllers::SongListController::UpdateDataAndFilters() {
     DEBUG("UpdateDataAndFilters");
 }
 
-
 void ViewControllers::SongListController::ShowPlaylistCreation() {
     // Hide modal cause bsml does not support automagic hiding of it
     this->moreModal->Hide(false, nullptr);
@@ -1047,7 +366,6 @@ void ViewControllers::SongListController::ShowPlaylistCreation() {
 };
 
 void ViewControllers::SongListController::ShowSettings() {
-
     this->settingsModal->OpenModal();
     // Hide modal cause bsml does not support automagic hiding of it
     this->moreModal->Hide(false, nullptr);
@@ -1071,12 +389,10 @@ void ViewControllers::SongListController::Download() {
 
 void GetByURLAsync(std::string url, std::function<void(bool success, std::vector<uint8_t>)> finished) {
     std::thread([url, finished] {
-        auto response = WebUtils::GetAsync<DataResponse>(
-            WebUtils::URLOptions(url)
-        );
+        auto response = WebUtils::GetAsync<WebUtils::DataResponse>(WebUtils::URLOptions(url));
 
         response.wait();
-        
+
         auto responseValue = response.get();
 
         bool success = responseValue.IsSuccessful();
@@ -1097,25 +413,26 @@ void GetByURLAsync(std::string url, std::function<void(bool success, std::vector
     }).detach();
 }
 
-custom_types::Helpers::Coroutine GetPreview(std::string url, std::function<void(UnityEngine::AudioClip *)> finished) {
-    auto webRequest = UnityEngine::Networking::UnityWebRequestMultimedia::GetAudioClip(url,
-                                                                                       UnityEngine::AudioType::MPEG);
-    co_yield reinterpret_cast<System::Collections::IEnumerator *>(CRASH_UNLESS(webRequest->SendWebRequest()));
+custom_types::Helpers::Coroutine GetPreview(std::string url, std::function<void(UnityW<UnityEngine::AudioClip>)> finished) {
+    auto webRequest = UnityEngine::Networking::UnityWebRequestMultimedia::GetAudioClip(url, UnityEngine::AudioType::MPEG);
+    co_yield reinterpret_cast<System::Collections::IEnumerator*>(CRASH_UNLESS(webRequest->SendWebRequest()));
     if (webRequest->GetError() != UnityEngine::Networking::UnityWebRequest::UnityWebRequestError::OK) {
         INFO("Network error");
         finished(nullptr);
         co_return;
     } else {
-        while (!webRequest->get_isDone());
+        // Wait for download to finish (should probably never happen)
+        while (!webRequest->get_isDone()) {
+        };
         INFO("Download complete");
-        UnityEngine::AudioClip *clip = UnityEngine::Networking::DownloadHandlerAudioClip::GetContent(webRequest);
+        UnityW<UnityEngine::AudioClip> clip = UnityEngine::Networking::DownloadHandlerAudioClip::GetContent(webRequest);
         DEBUG("Clip size: {}", pretty_bytes(webRequest->get_downloadedBytes()));
         finished(clip);
     }
     co_return;
 }
 
-void ViewControllers::SongListController::EnterSolo(GlobalNamespace::BeatmapLevel *level) {
+void ViewControllers::SongListController::EnterSolo(GlobalNamespace::BeatmapLevel* level) {
     if (level == nullptr) {
         ERROR("Level is null, refusing to continue");
         return;
@@ -1132,18 +449,14 @@ void ViewControllers::SongListController::EnterSolo(GlobalNamespace::BeatmapLeve
         return;
     }
 
-    auto category = SelectLevelCategoryViewController::LevelCategory(
-            SelectLevelCategoryViewController::LevelCategory::All);
+    auto category = SelectLevelCategoryViewController::LevelCategory(SelectLevelCategoryViewController::LevelCategory::All);
 
     // static_assert(sizeof (System::Nullable_1<SelectLevelCategoryViewController::LevelCategory>) == 0x8)
     auto levelCategory = System::Nullable_1<SelectLevelCategoryViewController::LevelCategory>();
     levelCategory.value = category;
     levelCategory.hasValue = true;
 
-    auto state = LevelSelectionFlowCoordinator::State::New_ctor(
-            customLevelsPack,
-            static_cast<GlobalNamespace::BeatmapLevel *>(level)
-    );
+    auto state = LevelSelectionFlowCoordinator::State::New_ctor(customLevelsPack, static_cast<GlobalNamespace::BeatmapLevel*>(level));
 
     state->___levelCategory = levelCategory;
 
@@ -1153,25 +466,21 @@ void ViewControllers::SongListController::EnterSolo(GlobalNamespace::BeatmapLeve
     manager.GoToSongSelect();
 
     // For some reason setup does not work for multiplayer so I have to use this method to workaround
-    if (
-            multiplayerLevelSelectionFlowCoordinator &&
-            multiplayerLevelSelectionFlowCoordinator->___levelSelectionNavigationController &&
-            multiplayerLevelSelectionFlowCoordinator->___levelSelectionNavigationController->____levelCollectionNavigationController
-            ) {
+    if (multiplayerLevelSelectionFlowCoordinator && multiplayerLevelSelectionFlowCoordinator->___levelSelectionNavigationController &&
+        multiplayerLevelSelectionFlowCoordinator->___levelSelectionNavigationController->____levelCollectionNavigationController) {
         DEBUG("Selecting level in multiplayer");
 
         multiplayerLevelSelectionFlowCoordinator->___levelSelectionNavigationController->____levelCollectionNavigationController->SelectLevel(
-                static_cast<GlobalNamespace::BeatmapLevel *>(level)
+            static_cast<GlobalNamespace::BeatmapLevel*>(level)
         );
     };
 }
 
-
 void ViewControllers::SongListController::Play() {
     this->PlaySong();
 }
 
-void ViewControllers::SongListController::PlaySong(const SongDetailsCache::Song *songToPlay) {
+void ViewControllers::SongListController::PlaySong(SongDetailsCache::Song const* songToPlay) {
     if (songToPlay == nullptr) {
         songToPlay = currentSong;
         if (currentSong == nullptr) {
@@ -1180,8 +489,11 @@ void ViewControllers::SongListController::PlaySong(const SongDetailsCache::Song
         }
     }
 
-    if (fcInstance->ConfirmCancelOfPending([this, songToPlay]() { PlaySong(songToPlay); }))
+    if (fcInstance->ConfirmCancelOfPending([this, songToPlay]() {
+            PlaySong(songToPlay);
+        })) {
         return;
+    }
 
     // Hopefully not leaking any memory
     auto fun = [this, songToPlay]() {
@@ -1193,12 +505,10 @@ void ViewControllers::SongListController::PlaySong(const SongDetailsCache::Song
             std::string songKey = fmt::format("{:X}", songToPlay->mapId());
             songKey = toLower(songKey);
             DEBUG("Looking for level by beatsaver id in path: {}", songKey);
-            level = SongCore::API::Loading::GetLevelByFunction(
-                    [mapId = songKey](auto level) {
-                        auto levelPath = level->get_customLevelPath();
-                        return levelPath.find(mapId) != std::string::npos;
-                    }
-            );
+            level = SongCore::API::Loading::GetLevelByFunction([mapId = songKey](auto level) {
+                auto levelPath = level->get_customLevelPath();
+                return levelPath.find(mapId) != std::string::npos;
+            });
         }
 
         // If all else fails, cancel
@@ -1209,12 +519,11 @@ void ViewControllers::SongListController::PlaySong(const SongDetailsCache::Song
         }
 
         // If we successfully found the level, we can continue
-        BSML::MainThreadScheduler::Schedule(
-                [this, level] {
-                    fromBSS = true;
-                    openToCustom = true;
-                    EnterSolo(level);
-                });
+        BSML::MainThreadScheduler::Schedule([this, level] {
+            fromBSS = true;
+            openToCustom = true;
+            EnterSolo(level);
+        });
     };
 
     if (fcInstance->DownloadHistoryViewController->hasUnloadedDownloads) {
@@ -1228,7 +537,6 @@ void ViewControllers::SongListController::PlaySong(const SongDetailsCache::Song
     }
 }
 
-
 void ViewControllers::SongListController::ShowBatchDownload() {
     this->multiDlModal->OpenModal();
     this->HideMoreModal();
@@ -1241,10 +549,9 @@ void ViewControllers::SongListController::ShowSongDetails() {
 }
 
 void ViewControllers::SongListController::UpdateDetails() {
-    if (currentSong == nullptr) return;
-
-    // Get old sprite if it exists
-    UnityEngine::Sprite *oldSprite = this->coverImage->get_sprite();
+    if (currentSong == nullptr) {
+        return;
+    }
 
     auto song = currentSong;
     auto beatmap = SongCore::API::Loading::GetLevelByHash(std::string(song->hash()));
@@ -1253,7 +560,7 @@ void ViewControllers::SongListController::UpdateDetails() {
 
     float minNPS = 500000, maxNPS = 0;
     float minNJS = 500000, maxNJS = 0;
-    for (const auto &diff: *song) {
+    for (auto const& diff : *song) {
         float nps = (float) diff.notes / (float) song->songDurationSeconds;
         float njs = diff.njs;
         minNPS = std::min(nps, minNPS);
@@ -1265,68 +572,73 @@ void ViewControllers::SongListController::UpdateDetails() {
 
     // downloadButton.set.text = "Download";
     SetIsDownloaded(downloaded);
-    selectedSongDiffInfo->set_text(
-            fmt::format("{:.2f} - {:.2f} NPS \n {:.2f} - {:.2f} NJS", minNPS, maxNPS, minNJS, maxNJS));
+    selectedSongDiffInfo->set_text(fmt::format("{:.2f} - {:.2f} NPS \n {:.2f} - {:.2f} NJS", minNPS, maxNPS, minNJS, maxNJS));
     selectedSongName->set_text(song->songName());
     selectedSongAuthor->set_text(song->songAuthorName());
 
     // This part below is here to not break anything on return
 #ifdef SONGDOWNLOADER
 
-    // if beatmap is loaded 
+    // if beatmap is loaded
     if (loaded) {
+        // Get old sprite if it exists
+        UnityW<UnityEngine::Sprite> oldSprite = this->coverImage->get_sprite();
+
         auto cover = BetterSongSearch::Util::getLocalCoverSync(beatmap);
-        if (cover != nullptr) {
+        if (cover) {
             this->coverImage->set_sprite(cover);
         } else {
             this->coverImage->set_sprite(defaultImage);
 
             // Cleanup old sprite
-            if (
-                // Don't delete defaultImage
-                    oldSprite != defaultImage.ptr() &&
-                    this->coverImage->get_sprite().unsafePtr() != oldSprite) {
-                if (oldSprite != nullptr) {
-                    DEBUG("REMOVING OLD SPRITE");
-                    auto texture = oldSprite->get_texture();
-                    if (texture != nullptr) {
-                        UnityEngine::Object::DestroyImmediate(texture);
-                    }
-                    UnityEngine::Object::DestroyImmediate(oldSprite);
+            if (oldSprite && oldSprite.ptr() != defaultImage.ptr()) {
+                UnityW<UnityEngine::Texture2D> texture = oldSprite->get_texture();
+                if (texture) {
+                    UnityEngine::Object::DestroyImmediate(texture);
                 }
+                UnityEngine::Object::DestroyImmediate(oldSprite);
             }
         }
         coverLoading->set_enabled(false);
     } else {
-
         std::string newUrl = fmt::format("{}/{}.jpg", BeatSaverRegionManager::coverDownloadUrl, toLower(song->hash()));
         DEBUG("{}", newUrl.c_str());
         coverLoading->set_enabled(true);
-        GetByURLAsync(newUrl, [this, song, oldSprite](bool success, std::vector<uint8_t> bytes) {
-            BSML::MainThreadScheduler::Schedule([this, bytes, song, success, oldSprite] {
+        GetByURLAsync(newUrl, [this, song](bool success, std::vector<uint8_t> bytes) {
+            BSML::MainThreadScheduler::Schedule([this, bytes, song, success] {
+                // Get old sprite if it exists
+                UnityW<UnityEngine::Sprite> oldSprite = this->coverImage->get_sprite();
                 if (success) {
                     std::vector<uint8_t> data = bytes;
                     DEBUG("Image size: {}", pretty_bytes(bytes.size()));
-                    if (song->hash() != this->currentSong->hash()) return;
-                    Array<uint8_t> *spriteArray = il2cpp_utils::vectorToArray(data);
-                    this->coverImage->set_sprite(BSML::Lite::ArrayToSprite(spriteArray));
+                    if (song->hash() != this->currentSong->hash()) {
+                        return;
+                    }
+                    Array<uint8_t>* spriteArray = il2cpp_utils::vectorToArray(data);
+                    UnityW<UnityEngine::Sprite> sprite = BSML::Lite::ArrayToSprite(spriteArray);
+                    if (sprite) {
+                        DEBUG("Setting sprite");
+                        this->coverImage->set_sprite(sprite);
+                    } else {
+                        WARNING("Setting default image, sprite was invalid");
+                        this->coverImage->set_sprite(defaultImage);
+                    }
                 } else {
                     this->coverImage->set_sprite(defaultImage);
                 }
+
+                // Disable loading animation
                 coverLoading->set_enabled(false);
 
                 // Cleanup old sprite
-                if (
-                    // Don't delete old image if it's a default image
-                        oldSprite != defaultImage.ptr() &&
-                        this->coverImage->get_sprite().unsafePtr() != oldSprite) {
-                    if (oldSprite != nullptr) {
-                        auto texture = oldSprite->get_texture();
-                        if (texture != nullptr) {
-                            UnityEngine::Object::DestroyImmediate(texture);
-                        }
-                        UnityEngine::Object::DestroyImmediate(oldSprite);
+                if (oldSprite && oldSprite.ptr() != defaultImage.ptr() &&  // Old sprite is not default image
+                    this->coverImage->get_sprite().ptr() != oldSprite.ptr()  // Old sprite is not the current sprite
+                ) {
+                    UnityW<UnityEngine::Texture2D> texture = oldSprite->get_texture();
+                    if (texture) {
+                        UnityEngine::Object::DestroyImmediate(texture);
                     }
+                    UnityEngine::Object::DestroyImmediate(oldSprite);
                 }
             });
         });
@@ -1334,31 +646,28 @@ void ViewControllers::SongListController::UpdateDetails() {
 
     // If the song is loaded then get it from local sources
     if (loaded) {
-        if (!levelCollectionViewController)
+        if (!levelCollectionViewController) {
             return;
+        }
 
-        levelCollectionViewController->SongPlayerCrossfadeToLevelAsync(beatmap,
-                                                                       System::Threading::CancellationToken::get_None());
+        levelCollectionViewController->SongPlayerCrossfadeToLevelAsync(beatmap, System::Threading::CancellationToken::get_None());
     } else {
         if (!getPluginConfig().LoadSongPreviews.GetValue()) {
         } else {
-            if (!songPreviewPlayer)
+            if (!songPreviewPlayer) {
                 return;
+            }
 
             auto ssp = songPreviewPlayer;
 
-            std::string newUrl = fmt::format("{}/{}.mp3", BeatSaverRegionManager::coverDownloadUrl,
-                                             toLower(song->hash()));
+            std::string newUrl = fmt::format("{}/{}.mp3", BeatSaverRegionManager::coverDownloadUrl, toLower(song->hash()));
 
-            coro(GetPreview(
-                    newUrl,
-                    [ssp](UnityEngine::AudioClip *clip) {
-                        if (clip == nullptr) {
-                            return;
-                        }
-                        ssp->CrossfadeTo(clip, -5, 0, clip->get_length(), nullptr);
-                    }
-            ));
+            coro(GetPreview(newUrl, [ssp](UnityW<UnityEngine::AudioClip> clip) {
+                if (!clip) {
+                    return;
+                }
+                ssp->CrossfadeTo(clip, -5, 0, clip->get_length(), nullptr);
+            }));
         }
     }
 
@@ -1371,43 +680,38 @@ void ViewControllers::SongListController::FilterByUploader() {
     }
 
     fcInstance->FilterViewController->uploadersString = this->currentSong->uploaderName();
-    SetStringSettingValue(fcInstance->FilterViewController->uploadersStringControl,
-                          (std::string) this->currentSong->uploaderName());
+    SetStringSettingValue(fcInstance->FilterViewController->uploadersStringControl, (std::string) this->currentSong->uploaderName());
     fcInstance->FilterViewController->UpdateFilterSettings();
     DEBUG("FilterByUploader");
 }
 
 // BSML::CustomCellInfo
-HMUI::TableCell *ViewControllers::SongListController::CellForIdx(HMUI::TableView *tableView, int idx) {
-    return ViewControllers::SongListTableData::GetCell(tableView)->PopulateWithSongData(
-            DataHolder::sortedSongList[idx]);
+HMUI::TableCell* ViewControllers::SongListController::CellForIdx(HMUI::TableView* tableView, int idx) {
+    return ViewControllers::SongListTableData::GetCell(tableView)->PopulateWithSongData(dataHolder.displayedSongList[idx]);
 }
 
 void ViewControllers::SongListController::UpdateSearch() {
-
 }
 
-void
-ViewControllers::SongListController::SortAndFilterSongs(SortMode sort, std::string_view const search, bool resetTable) {
-    // Skip if not active 
-    if (get_isActiveAndEnabled() == false) {
+void ViewControllers::SongListController::SortAndFilterSongs(FilterTypes::SortMode sort, std::string_view const search, bool resetTable) {
+    // Skip if not active
+    if (!get_isActiveAndEnabled()) {
         return;
     }
-    this->sort = sort;
-    this->search = search;
+
+    dataHolder.sort = sort;
+    dataHolder.search = search;
 
     this->UpdateSearchedSongsList();
 }
 
-void ViewControllers::SongListController::SetSelectedSong(const SongDetailsCache::Song *song) {
+void ViewControllers::SongListController::SetSelectedSong(SongDetailsCache::Song const* song) {
     // TODO: Fill all fields, download image, activate buttons
     if (currentSong != nullptr && currentSong->hash() == song->hash()) {
         return;
     }
     currentSong = song;
 
-    // LogSongInfo(song);
-
     DEBUG("Updating details");
     this->UpdateDetails();
 }
@@ -1420,84 +724,105 @@ void ViewControllers::SongListController::SetIsDownloaded(bool isDownloaded, boo
     infoButton->set_interactable(true);
 }
 
-
 void ViewControllers::SongListController::DownloadSongList() {
-    DEBUG("DownloadSongList");
-    if (DataHolder::loading) {
-        return;
+    fcInstance->FilterViewController->datasetInfoLabel->set_text("Loading dataset...");
+    dataHolder.DownloadSongList();
+}
+
+void ViewControllers::SongListController::RetryDownloadSongList() {
+    if (dataHolder.failed && !dataHolder.loading && !dataHolder.loaded) {
+        this->DownloadSongList();
     }
+}
 
-    fcInstance->FilterViewController->datasetInfoLabel->set_text("Loading dataset...");
+void ViewControllers::SongListController::SearchDone() {
+    auto isMainThread = BSML::MainThreadScheduler::CurrentThreadIsMainThread();
+    if (!isMainThread) {
+        ERROR("Calling SearchDone not on the main thread is not allowed, returning");
+        return;
+    }
 
-    std::thread([this] {
-        DataHolder::loading = true;
-        DEBUG("Getting songdetails");
-        DataHolder::songDetails = SongDetailsCache::SongDetails::Init().get();
-        DEBUG("Got songdetails");
+    DEBUG("Displaying {} songs", dataHolder.displayedSongList.size());
+    if (!songListTable()) {
+        // TODO: Actually understand why songListTable isn't available on soft refresh
+        WARNING("SongListTable is null, might be a soft refresh, returning as we don't need to reset anything on soft refresh");
+        return;
+    }
 
+    long long before = 0;
+    before = CurrentTimeMs();
+    this->ResetTable();
+    INFO("table reset in {} ms", CurrentTimeMs() - before);
 
-        if (!DataHolder::songDetails->songs.get_isDataAvailable()) {
-            this->SongDataError();
+    if (songSearchPlaceholder) {
+        if (dataHolder.filteredSongList.size() == dataHolder.songDetails->songs.size()) {
+            songSearchPlaceholder->set_text("Search by Song, Key, Mapper..");
         } else {
-            this->SongDataDone();
+            songSearchPlaceholder->set_text(fmt::format("Search {} songs", dataHolder.filteredSongList.size()));
         }
-    }).detach();
-}
+    }
 
-void ViewControllers::SongListController::RetryDownloadSongList() {
-    if (DataHolder::failed && !DataHolder::loading && !DataHolder::loaded) {
-        this->DownloadSongList();
+    // Reset song list table selection
+    if (!currentSong) {
+        SelectSong(songListTable(), 0);
+    } else {
+        // Always un-select in the list to prevent wrong-selections on resorting, etc.
+        songListTable()->ClearSelection();
     }
-}
 
+    this->searchInProgress->get_gameObject()->set_active(false);
+
+    // Run search again if something wants to
+    bool currentSortChanged = dataHolder.currentSort != dataHolder.sort;
+    bool currentSearchChanged = dataHolder.currentSearch != dataHolder.search;
+    bool currentFilterChanged = !dataHolder.filterOptionsCache.IsEqual(dataHolder.filterOptions);
+
+    IsSearching = false;
+
+    // Queue another search at the end of this one
+    if (currentSearchChanged || currentSortChanged || currentFilterChanged) {
+        DEBUG("Queueing another search");
+        DEBUG("Sort: {}, Search: {}, Filter: {}", currentSortChanged, currentSearchChanged, currentFilterChanged);
+        this->UpdateSearchedSongsList();
+    }
+}
 
 // Event receivers
 void ViewControllers::SongListController::SongDataDone() {
-    DEBUG("SongDataDone");
-    // Set state flags
-    DataHolder::loading = false;
-    DataHolder::failed = false;
-    DataHolder::loaded = true;
-    DataHolder::invalid = false;
-    DataHolder::needsRefresh = false;
-
     BSML::MainThreadScheduler::Schedule([this] {
-
         if (this->get_isActiveAndEnabled()) {
+            dataHolder.needsRefresh = false;
+            // TODO: Move into dataholder
             // Initial search
-            this->filterChanged = true;
-            fcInstance->SongListController->SortAndFilterSongs(this->sort, this->search, true);
-
-            std::chrono::sys_seconds timeScraped = DataHolder::songDetails->get_scrapeEndedTimeUnix();
+            dataHolder.forceReload = true;
+            fcInstance->SongListController->SortAndFilterSongs(dataHolder.sort, dataHolder.search, true);
+        }
+    });
+}
 
-            std::time_t tt = std::chrono::system_clock::to_time_t(timeScraped);
-            std::tm local_tm = *std::localtime(&tt);
+void ViewControllers::SongListController::SongDataError(std::string message) {
+}
 
-            std::string timeScrapedString = fmt::format("{:%d %b %y - %H:%M}", local_tm);
+void ViewControllers::SongListController::PlayerDataLoaded() {
+    if (songListTable() == nullptr) {
+        return;
+    }
+    // If it's searching, don't reload, it will be done after search
+    if (dataHolder.searchInProgress) {
+        return;
+    }
 
-            // filterView.datasetInfoLabel?.SetText($"{songDetails.songs.Length} songs in dataset | Newest: {songDetails.songs.Last().uploadTime.ToLocalTime():d\\. MMM yy - HH:mm}");
-            fcInstance->FilterViewController->datasetInfoLabel->set_text(
-                    fmt::format("{} songs in dataset.  Last update: {}", DataHolder::songDetails->songs.size(),
-                                timeScrapedString));
-        } else {
-            DataHolder::needsRefresh = true;
-        }
-    });
+    // IDK why this is here, but it's here
 }
 
-void ViewControllers::SongListController::SongDataError() {
-    DEBUG("SongDataError");
+void ViewControllers::SongListController::OnSongsLoaded(std::span<SongCore::SongLoader::CustomBeatmapLevel* const> songs) {
+    if (currentSong == nullptr) {
+        return;
+    }
 
-    // Set state flags
-    DataHolder::loading = false;
-    DataHolder::failed = true;
-    DataHolder::loaded = false;
-    DataHolder::invalid = true;
-    DataHolder::needsRefresh = false;
+    auto song = currentSong;
+    auto beatmap = SongCore::API::Loading::GetLevelByHash(std::string(song->hash()));
+    bool loaded = beatmap != nullptr;
 
-    BSML::MainThreadScheduler::Schedule([this] {
-        if (fcInstance != nullptr) {
-            fcInstance->FilterViewController->datasetInfoLabel->set_text("Failed to load, click to retry");
-        }
-    });
-}
\ No newline at end of file
+    SetIsDownloaded(loaded);
+}
diff --git a/src/UI/ViewControllers/SongListCell.cpp b/src/UI/ViewControllers/SongListCell.cpp
index 73dee6a..861f92d 100644
--- a/src/UI/ViewControllers/SongListCell.cpp
+++ b/src/UI/ViewControllers/SongListCell.cpp
@@ -1,36 +1,36 @@
 #include "UI/ViewControllers/SongListCell.hpp"
-#include "UI/ViewControllers/SongList.hpp"
 
-#include "UnityEngine/Color.hpp"
-#include "sombrero/shared/FastColor.hpp"
-#include "songcore/shared/SongCore.hpp"
-#include "song-details/shared/Data/MapCharacteristic.hpp"
-#include "song-details/shared/Data/RankedStatus.hpp"
-#include "PluginConfig.hpp"
-#include "Util/SongUtil.hpp"
 #include <fmt/chrono.h>
 #include <fmt/core.h>
-#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
 
+#include "DataHolder.hpp"
+#include "logging.hpp"
+#include "PluginConfig.hpp"
+#include "sombrero/shared/FastColor.hpp"
+#include "song-details/shared/Data/MapCharacteristic.hpp"
+#include "songcore/shared/SongLoader/RuntimeSongLoader.hpp"
+#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
+#include "UnityEngine/Color.hpp"
+#include "Util/SongUtil.hpp"
 
 using namespace BetterSongSearch::Util;
 using namespace SongDetailsCache;
 DEFINE_TYPE(BetterSongSearch::UI::ViewControllers, CustomSongListTableCell);
 
 struct DiffIndex {
-    const SongDetailsCache::SongDifficulty* diff;
+    SongDetailsCache::SongDifficulty const* diff;
     bool passesFilter;
     float stars;
 };
 
-namespace BetterSongSearch::UI::ViewControllers
-{
-    static std::map<const SongDetailsCache::MapDifficulty, std::string> shortMapDiffNames = {
+namespace BetterSongSearch::UI::ViewControllers {
+    static std::map<SongDetailsCache::MapDifficulty const, std::string> shortMapDiffNames = {
         {SongDetailsCache::MapDifficulty::Easy, "Easy"},
         {SongDetailsCache::MapDifficulty::Normal, "Norm"},
         {SongDetailsCache::MapDifficulty::Hard, "Hard"},
         {SongDetailsCache::MapDifficulty::Expert, "Ex"},
-        {SongDetailsCache::MapDifficulty::ExpertPlus, "Ex+"}};
+        {SongDetailsCache::MapDifficulty::ExpertPlus, "Ex+"}
+    };
 
     static std::map<SongDetailsCache::MapCharacteristic, std::string> customCharNames = {
         {SongDetailsCache::MapCharacteristic::Standard, ""},
@@ -39,123 +39,145 @@ namespace BetterSongSearch::UI::ViewControllers
         {SongDetailsCache::MapCharacteristic::ThreeSixtyDegree, "360"},
         {SongDetailsCache::MapCharacteristic::Lawless, "LL"},
         {SongDetailsCache::MapCharacteristic::Custom, "?"},
-        {SongDetailsCache::MapCharacteristic::LightShow, "LS"}};
+        {SongDetailsCache::MapCharacteristic::LightShow, "LS"}
+    };
 
-    std::string GetCombinedShortDiffName(int diffCount, const SongDetailsCache::SongDifficulty *diff)
-    {
+    std::string GetCombinedShortDiffName(int diffCount, SongDetailsCache::SongDifficulty const* diff) {
         auto retVal = fmt::format("{}", shortMapDiffNames[diff->difficulty]);
 
-        if (diff->characteristic == SongDetailsCache::MapCharacteristic::Standard)
+        if (diff->characteristic == SongDetailsCache::MapCharacteristic::Standard) {
             return retVal;
+        }
         retVal += fmt::format("({})", customCharNames[diff->characteristic]);
 
         return retVal;
     }
 
-    CustomSongListTableCell *CustomSongListTableCell::PopulateWithSongData(const SongDetailsCache::Song *entry)
-    {
+    void CustomSongListTableCell::ctor() {
+        // Subscribe to events
+        SongCore::SongLoader::RuntimeSongLoader::get_instance()->SongsLoaded += {&CustomSongListTableCell::OnSongsLoaded, this};
+    }
+
+    void CustomSongListTableCell::OnDestroy() {
+        // Unsub from events
+        // The only way this can be destroyed is if the game is closing,
+        // so no need to unsub, since songcore will be destroyed too
+    }
+
+    void CustomSongListTableCell::OnSongsLoaded(std::span<SongCore::SongLoader::CustomBeatmapLevel* const> songs) {
+        if (!this->get_isActiveAndEnabled()) {
+            return;
+        }
+        if (!dataHolder.songDetails->songs.get_isDataAvailable()) {
+            return;
+        }
+        if (!this->entry) {
+            return;
+        }
+
+        // Refresh the state
+        PopulateWithSongData(this->entry);
+    }
+
+    CustomSongListTableCell* CustomSongListTableCell::PopulateWithSongData(SongDetailsCache::Song const* entry) {
+        // Colors
+        static auto verifiedSongColor = Sombrero::FastColor(.7f, 1.0f, .7f, 1.0f);
+        static auto verifiedUploaderColor = Sombrero::FastColor(.46f, .27f, .68f, 1.0f);
+        static auto normalUploaderColor = Sombrero::FastColor(.8f, .8f, .8f, 1.0f);
+
+        bool isCurated = hasFlags(entry->uploadFlags, SongDetailsCache::UploadFlags::Curated);
+
         this->levelAuthorName->set_text(entry->levelAuthorName());
-        this->songLengthAndRating->set_text(fmt::format("Length: {:%M:%S} Upvotes: {}, Downvotes: {}", std::chrono::seconds(entry->songDurationSeconds), entry->upvotes, entry->downvotes));
+        this->songLengthAndRating->set_text(fmt::format(
+            "Length: {:%M:%S} Upvotes: {}, Downvotes: {}", std::chrono::seconds(entry->songDurationSeconds), entry->upvotes, entry->downvotes
+        ));
         this->uploadDateFormatted->set_text(fmt::format("{:%d. %b %Y}", fmt::localtime(entry->uploadTimeUnix)));
-        auto ranked = entry->rankedStatus == SongDetailsCache::RankedStatus::Ranked;
-        bool downloaded = fcInstance->DownloadHistoryViewController->CheckIsDownloaded(entry->hash());
+        bool isDownloaded = fcInstance->DownloadHistoryViewController->CheckIsDownloaded(entry->hash());
 
+        // Song name color
         Sombrero::FastColor songColor = Sombrero::FastColor::white();
-        if (downloaded)
-        {
+        if (isDownloaded) {
             songColor = Sombrero::FastColor(0.53f, 0.53f, 0.53f, 1.0f);
+        } else {
+            if (isCurated) {
+                songColor = verifiedSongColor;
+            }
         }
-
-        this->fullFormattedSongName->set_text(fmt::format("{} - {}",  entry->songAuthorName(), entry->songName()));
+        this->fullFormattedSongName->set_text(fmt::format("{} - {}", entry->songAuthorName(), entry->songName()));
         this->fullFormattedSongName->set_color(songColor);
 
+        // Author color
+        bool isVerified = hasFlags(entry->uploadFlags, SongDetailsCache::UploadFlags::VerifiedUploader);
+        this->levelAuthorName->set_color(isVerified ? verifiedUploaderColor : normalUploaderColor);
+
         this->entry = entry;
 
-        std::vector<DiffIndex>  sortedDiffs;
-        for (const SongDetailsCache::SongDifficulty &diff: *entry) {
-            sortedDiffs.push_back({
-                &diff,
-                DifficultyCheck(&diff, entry),
-                getStars(&diff)
-            });
+        std::vector<DiffIndex> sortedDiffs;
+        for (SongDetailsCache::SongDifficulty const& diff : *entry) {
+            sortedDiffs.push_back({&diff, DifficultyCheck(&diff, entry), getStars(&diff)});
         };
 
-        
         // TODO: Actually sort diffs..
-        std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](const DiffIndex& a,  const DiffIndex& b) {
-           
-            auto diff1 = (a.passesFilter? 1:-3) + (a.diff->characteristic == SongDetailsCache::MapCharacteristic::Standard? 1:0);
-            auto diff2 = (b.passesFilter? 1:-3) + (b.diff->characteristic == SongDetailsCache::MapCharacteristic::Standard? 1:0);
+        std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](DiffIndex const& a, DiffIndex const& b) {
+            auto diff1 = (a.passesFilter ? 1 : -3) + (a.diff->characteristic == SongDetailsCache::MapCharacteristic::Standard ? 1 : 0);
+            auto diff2 = (b.passesFilter ? 1 : -3) + (b.diff->characteristic == SongDetailsCache::MapCharacteristic::Standard ? 1 : 0);
 
             // Descending
             return diff1 > diff2;
         });
 
         // If most stars
-        if (DataHolder::currentSort == SortMode::Most_Stars) {
-            std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](const DiffIndex& a,  const DiffIndex& b) {
-           
-                auto diff1 = - a.stars;
-                auto diff2 = - b.stars;
+        if (dataHolder.currentSort == FilterTypes::SortMode::Most_Stars) {
+            std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](DiffIndex const& a, DiffIndex const& b) {
+                auto diff1 = -a.stars;
+                auto diff2 = -b.stars;
 
                 // Ascending
                 return diff1 < diff2;
             });
         }
         // If least stars
-        if (DataHolder::currentSort == SortMode::Least_Stars) {
-            std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](const DiffIndex& a,  const DiffIndex& b) {
-                auto diff1 = a.stars > 0 ? a.stars: -420.0f;
-                auto diff2 = b.stars > 0 ? b.stars: -420.0f;
+        if (dataHolder.currentSort == FilterTypes::SortMode::Least_Stars) {
+            std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](DiffIndex const& a, DiffIndex const& b) {
+                auto diff1 = a.stars > 0 ? a.stars : -420.0f;
+                auto diff2 = b.stars > 0 ? b.stars : -420.0f;
                 // Ascending
                 return diff1 < diff2;
             });
         }
 
         // By ranked
-        std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](const DiffIndex& a,  const DiffIndex& b) {
-            auto diff1 = a.stars > 0 ? 1: 0;
-            auto diff2 = b.stars > 0 ? 1: 0;
+        std::stable_sort(sortedDiffs.begin(), sortedDiffs.end(), [entry](DiffIndex const& a, DiffIndex const& b) {
+            auto diff1 = a.stars > 0 ? 1 : 0;
+            auto diff2 = b.stars > 0 ? 1 : 0;
             // Descending
             return diff1 < diff2;
         });
 
-    
-     
-
         int diffsLeft = sortedDiffs.size();
 
-        for (int i = 0; i < diffs.size(); i++)
-        {
+        for (int i = 0; i < diffs.size(); i++) {
             bool isActive = diffsLeft != 0;
             diffs[i]->get_gameObject()->set_active(isActive);
-            if (!isActive)
+            if (!isActive) {
                 continue;
-            if (diffsLeft != 1 && i == diffs.size() - 1)
-            {
-                diffs[i]->set_text(fmt::format("<color=#0AD>{} More", diffsLeft));
             }
-            else
-            {
+            if (diffsLeft != 1 && i == diffs.size() - 1) {
+                diffs[i]->set_text(fmt::format("<color=#0AD>{} More", diffsLeft));
+            } else {
                 bool passesFilter = sortedDiffs[i].passesFilter;
                 auto diffname = GetCombinedShortDiffName(entry->diffCount, sortedDiffs[i].diff);
                 std::string stars = "";
 
                 auto lbsvc = GetTargetedRankLeaderboardService(sortedDiffs[i].diff);
 
-				if(lbsvc == RankedStates::ScoresaberRanked && sortedDiffs[i].diff->starsSS > 0) {
-					stars = fmt::format(" <color=#{}>{}", (passesFilter ? "D91" : "650"), fmt::format("{:.{}f}", sortedDiffs[i].stars, 1));
-				} else if(lbsvc == RankedStates::BeatleaderRanked && sortedDiffs[i].diff->starsBL > 0) {
-					stars = fmt::format(" <color=#{}>{}", (passesFilter ? "B1D" : "606"), fmt::format("{:.{}f}", sortedDiffs[i].stars, 1));
-				}
-                auto text = fmt::format("<color=#{}>{}</color>{}",
-                        (passesFilter ? "EEE" : "888"),
-                        diffname,
-                        stars
-                    );
-                diffs[i]->SetText(
-                    text, false
-                );
+                if (lbsvc == RankedStates::ScoresaberRanked && sortedDiffs[i].diff->starsSS > 0) {
+                    stars = fmt::format(" <color=#{}>{}", (passesFilter ? "D91" : "650"), fmt::format("{:.{}f}", sortedDiffs[i].stars, 1));
+                } else if (lbsvc == RankedStates::BeatleaderRanked && sortedDiffs[i].diff->starsBL > 0) {
+                    stars = fmt::format(" <color=#{}>{}", (passesFilter ? "B1D" : "606"), fmt::format("{:.{}f}", sortedDiffs[i].stars, 1));
+                }
+                auto text = fmt::format("<color=#{}>{}</color>{}", (passesFilter ? "EEE" : "888"), diffname, stars);
+                diffs[i]->SetText(text, false);
                 diffsLeft--;
             }
         }
@@ -164,44 +186,35 @@ namespace BetterSongSearch::UI::ViewControllers
         return this;
     }
 
-    void CustomSongListTableCell::RefreshBgState()
-    {
+    void CustomSongListTableCell::RefreshBgState() {
         bgContainer->set_color(UnityEngine::Color(0, 0, 0, selected || highlighted ? 0.8f : 0.45f));
     }
 
-    void CustomSongListTableCell::SelectionDidChange(HMUI::SelectableCell::TransitionType transitionType)
-    {
+    void CustomSongListTableCell::SelectionDidChange(HMUI::SelectableCell::TransitionType transitionType) {
         RefreshBgState();
     }
 
-    void CustomSongListTableCell::HighlightDidChange(HMUI::SelectableCell::TransitionType transitionType)
-    {
+    void CustomSongListTableCell::HighlightDidChange(HMUI::SelectableCell::TransitionType transitionType) {
         RefreshBgState();
     }
 
-    void CustomSongListTableCell::WasPreparedForReuse()
-    {
+    void CustomSongListTableCell::WasPreparedForReuse() {
         entry = nullptr;
     }
 
-    void CustomSongListTableCell::SetFontSizes()
-    {
+    void CustomSongListTableCell::SetFontSizes() {
         bool smallFont = getPluginConfig().SmallerFontSize.GetValue();
-        for (auto d : diffs)
-        {
+        for (auto d : diffs) {
             d->set_fontSize(smallFont ? 2.5f : 2.9f);
         }
 
         // TODO: Different font sizes
-        if (smallFont)
-        {
+        if (smallFont) {
             fullFormattedSongName->set_fontSize(2.7f);
             uploadDateFormatted->set_fontSize(2.7f);
             levelAuthorName->set_fontSize(2.3f);
             songLengthAndRating->set_fontSize(2.5f);
-        }
-        else
-        {
+        } else {
             fullFormattedSongName->set_fontSize(3.2f);
             uploadDateFormatted->set_fontSize(3.2f);
             levelAuthorName->set_fontSize(2.6f);
@@ -210,4 +223,4 @@ namespace BetterSongSearch::UI::ViewControllers
 
         return;
     };
-}
+}  // namespace BetterSongSearch::UI::ViewControllers
diff --git a/src/Util/BSMLStuff.cpp b/src/Util/BSMLStuff.cpp
index a46620f..4bb323e 100644
--- a/src/Util/BSMLStuff.cpp
+++ b/src/Util/BSMLStuff.cpp
@@ -1,36 +1,32 @@
 #include "Util/BSMLStuff.hpp"
+
+#include "custom-types/shared/coroutine.hpp"
 #include "HMUI/CurvedTextMeshPro.hpp"
-#include "HMUI/ScrollView.hpp"
-#include "HMUI/NoTransitionsButton.hpp"
 #include "HMUI/CustomFormatRangeValuesSlider.hpp"
+#include "HMUI/ScrollView.hpp"
+#include "UnityEngine/GameObject.hpp"
 #include "UnityEngine/RectTransform.hpp"
 #include "UnityEngine/UI/LayoutElement.hpp"
-#include "UnityEngine/Resources.hpp"
-#include "UnityEngine/GameObject.hpp"
-#include "UnityEngine/UI/Button.hpp"
-#include "bsml/shared/Helpers/delegates.hpp"
-#include "custom-types/shared/coroutine.hpp"
+#include "UnityEngine/WaitForEndOfFrame.hpp"
 
 #define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
 
-namespace BetterSongSearch::UI::Util::BSMLStuff
-{
-    custom_types::Helpers::Coroutine MergeSliders(GameObject* container, bool constrictValuesMinMax)
-    {
+using namespace UnityEngine;
+
+namespace BetterSongSearch::UI::Util::BSMLStuff {
+    custom_types::Helpers::Coroutine MergeSliders(GameObject* container, bool constrictValuesMinMax) {
         co_yield nullptr;
-        auto items = container->GetComponentsInChildren<HMUI::CurvedTextMeshPro *>();
-     
+        auto items = container->GetComponentsInChildren<HMUI::CurvedTextMeshPro*>();
+
         // Construct a list of MERGE_TO_PREV
-        std::vector<HMUI::CurvedTextMeshPro *> filteredItems = std::vector<HMUI::CurvedTextMeshPro *>();
+        std::vector<HMUI::CurvedTextMeshPro*> filteredItems = std::vector<HMUI::CurvedTextMeshPro*>();
 
-        for (auto item : items)
-        {
-            if (item != nullptr && item->___m_CachedPtr.m_value != nullptr && item->get_text() == "MERGE_TO_PREV")
-            {
+        for (auto item : items) {
+            if (item != nullptr && item->___m_CachedPtr.m_value != nullptr && item->get_text() == "MERGE_TO_PREV") {
                 filteredItems.push_back(item);
             }
         }
-        
+
         for (auto x : filteredItems) {
             co_yield reinterpret_cast<System::Collections::IEnumerator*>(WaitForEndOfFrame::New_ctor());
             auto ourContainer = x->get_transform()->get_parent();
@@ -43,7 +39,7 @@ namespace BetterSongSearch::UI::Util::BSMLStuff
             auto minTimeSlider = prevContainer->GetComponentInChildren<HMUI::CustomFormatRangeValuesSlider*>();
             auto maxTimeSlider = ourContainer->GetComponentInChildren<HMUI::CustomFormatRangeValuesSlider*>();
 
-            if(minTimeSlider == nullptr || maxTimeSlider == nullptr) {
+            if (minTimeSlider == nullptr || maxTimeSlider == nullptr) {
                 co_yield nullptr;
             } else {
                 auto newSize = minTimeSlider->get_valueSize() / 2.1f;
@@ -69,7 +65,6 @@ namespace BetterSongSearch::UI::Util::BSMLStuff
         // element->slider->set_value(value);
         element->set_Value(value);
         element->ApplyValue();
-        
     }
 
     void FormatSliderSettingValue(BSML::SliderSetting* element) {
@@ -78,14 +73,11 @@ namespace BetterSongSearch::UI::Util::BSMLStuff
         auto formatter = element->formatter;
         element->text->set_text(formatter ? formatter(value) : StringW(fmt::format("{}", value)));
     }
+
     void FormatStringSettingValue(BSML::StringSetting* element) {
         // Not pretty but works
         auto value = element->get_text();
         auto formatter = element->formatter;
         element->text->set_text(formatter ? formatter(value) : value);
     }
-};
-
-
-
-
+};  // namespace BetterSongSearch::UI::Util::BSMLStuff
diff --git a/src/Util/CurrentTimeMs.cpp b/src/Util/CurrentTimeMs.cpp
index 2b998b4..b897d1e 100644
--- a/src/Util/CurrentTimeMs.cpp
+++ b/src/Util/CurrentTimeMs.cpp
@@ -1,11 +1,11 @@
 #include "Util/CurrentTimeMs.hpp"
 
 namespace BetterSongSearch::Util {
-    long long CurrentTimeMs(){
+    long long CurrentTimeMs() {
         // Set up a timer
         auto lastUpdate = std::chrono::system_clock::now();
         auto milis = std::chrono::duration_cast<std::chrono::milliseconds>(lastUpdate.time_since_epoch());
         auto now = milis.count();
         return now;
     }
-}
\ No newline at end of file
+}  // namespace BetterSongSearch::Util
diff --git a/src/Util/Debug.cpp b/src/Util/Debug.cpp
index 182fb1e..5a05638 100644
--- a/src/Util/Debug.cpp
+++ b/src/Util/Debug.cpp
@@ -1,232 +1,193 @@
 #include "Util/Debug.hpp"
+
 #include <string>
-#include "main.hpp"
-#include "UI/ViewControllers/SongList.hpp"
-#include "logging.hpp"
-using namespace std;
 
+#include "DataHolder.hpp"
+#include "logging.hpp"
+#include "Util/SongUtil.hpp"
 
-    string BetterSongSearch::Util::SortToString(int sortMode) {
-        switch (sortMode)
-        {
+std::string BetterSongSearch::Util::SortToString(int sortMode) {
+    switch (sortMode) {
         case 0:
             return "Newest";
-            break;
         case 1:
             return "Oldest";
-            break;
         case 2:
             return "Latest_Ranked";
-            break;
         case 3:
             return "Most_Stars";
-            break;
         case 4:
             return "Least_Stars";
-            break;
         case 5:
             return "Best_rated";
-            break;
         case 6:
             return "Worst_rated";
-            break;
         default:
             return "Unknown";
-            break;
-        }
     }
+}
 
-    string BetterSongSearch::Util::RequirementTypeToString(int requirementType) {
-        switch (requirementType)
-        {
+std::string BetterSongSearch::Util::RequirementTypeToString(int requirementType) {
+    switch (requirementType) {
         case 0:
             return "Any";
-            break;
         case 1:
             return "NoodleExtensions";
-            break;
         case 2:
             return "MappingExtensions";
-            break;
         case 3:
             return "Chroma";
-            break;
         case 4:
             return "Cinema";
-            break;
         case 5:
             return "None";
-            break;
         default:
             return "Unknown";
-            break;
-        }
     }
+}
 
-    string BetterSongSearch::Util::CharFilterTypeToString(int charFilterType) {
-        switch (charFilterType)
-        {
+std::string BetterSongSearch::Util::CharFilterTypeToString(int charFilterType) {
+    switch (charFilterType) {
         case 0:
             return "All";
-            break;
         case 1:
             return "Custom";
-            break;
         case 2:
             return "Standard";
-            break;
         case 3:
             return "OneSaber";
-            break;
         case 4:
             return "NoArrows";
-            break;
         case 5:
             return "NinetyDegrees";
-            break;
         case 6:
             return "ThreeSixtyDegrees";
-            break;
         case 7:
             return "LightShow";
-            break;
         case 8:
             return "Lawless";
-            break;
         default:
             return "Unknown";
-            break;
-        }
     }
+}
 
-    string BetterSongSearch::Util::DifficultyFilterTypeToString(int diffFilterType) {
-        switch (diffFilterType)
-        {
+std::string BetterSongSearch::Util::DifficultyFilterTypeToString(int diffFilterType) {
+    switch (diffFilterType) {
         case 0:
             return "All";
-            break;
         case 1:
             return "Easy";
-            break;
         case 2:
             return "Normal";
-            break;
         case 3:
             return "Hard";
-            break;
         case 4:
             return "Expert";
-            break;
         case 5:
             return "ExpertPlus";
-            break;
         default:
             return "Unknown";
-            break;
-        }
     }
+}
 
-    string BetterSongSearch::Util::RankedFilterTypeToString(int rankedFilterType) {
-        switch (rankedFilterType)
-        {
+std::string BetterSongSearch::Util::RankedFilterTypeToString(int rankedFilterType) {
+    switch (rankedFilterType) {
         case 0:
             return "ShowAll";
-            break;
         case 1:
             return "ScoreSaberRanked";
-            break;
         case 2:
             return "BeatLeaderRanked";
-            break;
         case 3:
             return "ScoreSaberQualified";
-            break;
         case 4:
             return "BeatLeaderQualified";
-            break;
         default:
             return "Unknown";
-            break;
-        }
     }
-    string BetterSongSearch::Util::LocalScoreFilterTypeToString(int localScoreFilterType) {
-        switch (localScoreFilterType)
-        {
+}
+
+std::string BetterSongSearch::Util::LocalScoreFilterTypeToString(int localScoreFilterType) {
+    switch (localScoreFilterType) {
         case 0:
             return "All";
-            break;
         case 1:
             return "HidePassed";
-            break;
         case 2:
             return "OnlyPassed";
-            break;
         default:
             return "Unknown";
-            break;
-        }
     }
+}
 
-    string BetterSongSearch::Util::DownloadFilterTypeToString(int downloadFilterType) {
-        switch (downloadFilterType)
-        {
+std::string BetterSongSearch::Util::DownloadFilterTypeToString(int downloadFilterType) {
+    switch (downloadFilterType) {
         case 0:
             return "All";
-            break;
         case 1:
             return "HidePassed";
-            break;
         case 2:
             return "OnlyPassed";
-            break;
         default:
             return "Unknown";
-            break;
-        }
     }
+}
 
-    // Logs song info for checking sort and options
-    void BetterSongSearch::Util::LogSongInfo(const SongDetailsCache::Song* song) {
-        // DEBUG info
-        auto struct1DiffVec = song->rankedChangeUnix;
-        DEBUG("Name: {}, bpm {}, upvotes: {}, downvotes: {}, diffCount: {}, rankedStatus: {}, rankedStates: {} ", (std::string)song->songName(), song->bpm, song->upvotes, song->downvotes, song->diffCount, song->rankedStatus, song->rankedStates  );
-        DEBUG("Ranked time: {}", struct1DiffVec);
-        for (const SongDetailsCache::SongDifficulty &diff: *song) {
-            DEBUG(
-                "Diff: {}, Ranked: {}, starsSS: {}, starsBL: {}, notes: {}, characteristic: {}, njs: {}, mods: {} ",
-                diff.difficulty, diff.ranked(), diff.starsSS, diff.starsBL, diff.notes, diff.characteristic, diff.njs, diff.mods
-            );
-
-        }
-        DEBUG("Sort score: {}", sortFunctionMap.at(UI::DataHolder::currentSort)(song));
+// Logs song info for checking sort and options
+void BetterSongSearch::Util::LogSongInfo(SongDetailsCache::Song const* song) {
+    // DEBUG info
+    auto struct1DiffVec = song->rankedChangeUnix;
+    DEBUG(
+        "Name: {}, bpm {}, upvotes: {}, downvotes: {}, diffCount: {}, rankedStatus: {}, rankedStates: {} ",
+        (std::string) song->songName(),
+        song->bpm,
+        song->upvotes,
+        song->downvotes,
+        song->diffCount,
+        song->rankedStatus,
+        song->rankedStates
+    );
+    DEBUG("Ranked time: {}", struct1DiffVec);
+    for (SongDetailsCache::SongDifficulty const& diff : *song) {
+        DEBUG(
+            "Diff: {}, Ranked: {}, starsSS: {}, starsBL: {}, notes: {}, characteristic: {}, njs: {}, mods: {} ",
+            diff.difficulty,
+            diff.ranked(),
+            diff.starsSS,
+            diff.starsBL,
+            diff.notes,
+            diff.characteristic,
+            diff.njs,
+            diff.mods
+        );
     }
+    DEBUG("Sort score: {}", sortFunctionMap.at(dataHolder.currentSort)(song));
+}
 
-    // Prints to the provided buffer a nice number of bytes (KB, MB, GB, etc)
-    string BetterSongSearch::Util::pretty_bytes(int64_t bytes)
-    {
-        string prefix = "";
+// Prints to the provided buffer a nice number of bytes (KB, MB, GB, etc)
+std::string BetterSongSearch::Util::pretty_bytes(int64_t bytes) {
+    std::string prefix = "";
 
-        if (bytes < 0 ) {
-            prefix = "-";
-        }
-        const char* suffixes[7];
-        suffixes[0] = "B";
-        suffixes[1] = "KB";
-        suffixes[2] = "MB";
-        suffixes[3] = "GB";
-        suffixes[4] = "TB";
-        suffixes[5] = "PB";
-        suffixes[6] = "EB";
-        uint s = 0; // which suffix to use
-        double count = abs(bytes);
-        while (count >= 1024 && s < 7)
-        { 
-            s++;
-            count /= 1024;
-        }
-        if (count - floor(count) == 0.0)
-            return fmt::format("{}{} {}", prefix, (int)count, suffixes[s]);
-        else
-            return fmt::format("{}{:.2f} {}", prefix, count, suffixes[s]);
+    if (bytes < 0) {
+        prefix = "-";
     }
-
+    char const* suffixes[7];
+    suffixes[0] = "B";
+    suffixes[1] = "KB";
+    suffixes[2] = "MB";
+    suffixes[3] = "GB";
+    suffixes[4] = "TB";
+    suffixes[5] = "PB";
+    suffixes[6] = "EB";
+    uint s = 0;  // which suffix to use
+    double count = abs(bytes);
+    while (count >= 1024 && s < 7) {
+        s++;
+        count /= 1024;
+    }
+    if (count - floor(count) == 0.0) {
+        return fmt::format("{}{} {}", prefix, (int) count, suffixes[s]);
+    } else {
+        return fmt::format("{}{:.2f} {}", prefix, count, suffixes[s]);
+    }
+}
diff --git a/src/Util/Random.cpp b/src/Util/Random.cpp
index e48519b..5e0f7c5 100644
--- a/src/Util/Random.cpp
+++ b/src/Util/Random.cpp
@@ -1,16 +1,15 @@
 #include "Util/Random.hpp"
 
+#include <random>
+
 namespace BetterSongSearch::Util {
-    // Generate random number 
-    // Stolen from https://stackoverflow.com/questions/7560114/random-number-c-in-some-range
-    int random(int min, int max) //range : [min, max]
+    // Generate random number
+    int random(int min, int max)  // range : [min, max]
     {
-        static bool first = true;
-        if (first) 
-        {  
-            srand( time(NULL) ); //seeding for the first time only!
-            first = false;
-        }
-        return min + rand() % (( max + 1 ) - min);
+        static std::random_device rd;
+        static std::mt19937 generator(rd());
+
+        std::uniform_int_distribution<int> distribution(min, max);
+        return distribution(generator);
     }
-}
\ No newline at end of file
+}  // namespace BetterSongSearch::Util
diff --git a/src/Util/SongUtil.cpp b/src/Util/SongUtil.cpp
index ef7c046..f24d540 100644
--- a/src/Util/SongUtil.cpp
+++ b/src/Util/SongUtil.cpp
@@ -1,15 +1,19 @@
 #include "Util/SongUtil.hpp"
-#include "logging.hpp"
-#include "bsml/shared/BSML-Lite/Creation/Image.hpp"
 
-#include "UI/ViewControllers/SongList.hpp"
+#include "bsml/shared/BSML-Lite/Creation/Image.hpp"
+#include "DataHolder.hpp"
+#include "logging.hpp"
 #include "songcore/shared/SongLoader/CustomBeatmapLevel.hpp"
+#include "Util/TextUtil.hpp"
+
+using namespace SongDetailsCache;
+
 namespace BetterSongSearch::Util {
-    UnityEngine::Sprite* getLocalCoverSync(SongCore::SongLoader::CustomBeatmapLevel* level) {
+    UnityW<UnityEngine::Sprite> getLocalCoverSync(SongCore::SongLoader::CustomBeatmapLevel* level) {
         if (level == nullptr) {
             return nullptr;
         }
-        
+
         std::string imageFileName = "";
         {
             auto saveDataV2 = level->get_standardLevelInfoSaveDataV2();
@@ -32,11 +36,9 @@ namespace BetterSongSearch::Util {
             return nullptr;
         }
 
-        StringW path = System::IO::Path::Combine(
-                level->get_customLevelPath(),
-        imageFileName);
+        StringW path = System::IO::Path::Combine(level->get_customLevelPath(), imageFileName);
 
-        if(!System::IO::File::Exists(path)) {
+        if (!System::IO::File::Exists(path)) {
             DEBUG("File does not exist");
             return nullptr;
         }
@@ -45,8 +47,7 @@ namespace BetterSongSearch::Util {
         return sprite;
     }
 
-
-    UnityEngine::Sprite* getLocalCoverSync(StringW songHash) {
+    UnityW<UnityEngine::Sprite> getLocalCoverSync(StringW songHash) {
         auto beatmap = SongCore::API::Loading::GetLevelByHash(std::string(songHash));
 
         if (beatmap) {
@@ -57,26 +58,27 @@ namespace BetterSongSearch::Util {
     }
 
     // Gets preferred leaderboard for a song difficulty
-    SongDetailsCache::RankedStates GetTargetedRankLeaderboardService(const SongDetailsCache::SongDifficulty* diff) {
+    SongDetailsCache::RankedStates GetTargetedRankLeaderboardService(SongDetailsCache::SongDifficulty const* diff) {
         auto& rStates = diff->song().rankedStates;
 
+        auto& filterOptions = dataHolder.filterOptionsCache;
+
         // If song is scoresaber ranked
-        if (hasFlags(rStates, SongDetailsCache::RankedStates::ScoresaberRanked) && 
+        if (hasFlags(rStates, RankedStates::ScoresaberRanked) &&
             // And Not Filtering by BeatLeader ranked
-            UI::DataHolder::filterOptionsCache.rankedType != FilterOptions::RankedFilterType::BeatLeaderRanked && 
+            static_cast<FilterTypes::RankedFilter>(dataHolder.filterOptionsCache.rankedType) != FilterTypes::RankedFilter::BeatLeaderRanked &&
             (
                 // Beatleader is not preferred leaderboard
-                BetterSongSearch::UI::DataHolder::preferredLeaderboard != PreferredLeaderBoard::BeatLeader ||
+                dataHolder.preferredLeaderboard != FilterTypes::PreferredLeaderBoard::BeatLeader ||
                 // Song has no BeatLeader rank
-                !hasFlags(rStates, SongDetailsCache::RankedStates::BeatleaderRanked) ||
+                !hasFlags(rStates, RankedStates::BeatleaderRanked) ||
                 // Filtering by SS ranked
-                UI::DataHolder::filterOptionsCache.rankedType == FilterOptions::RankedFilterType::ScoreSaberRanked 
-            )
-        ) {
+                static_cast<FilterTypes::RankedFilter>(dataHolder.filterOptionsCache.rankedType) == FilterTypes::RankedFilter::ScoreSaberRanked
+            )) {
             return SongDetailsCache::RankedStates::ScoresaberRanked;
         }
 
-        // If song has beatleader rank then return beatleader 
+        // If song has beatleader rank then return beatleader
         if (hasFlags(rStates, SongDetailsCache::RankedStates::BeatleaderRanked)) {
             return SongDetailsCache::RankedStates::BeatleaderRanked;
         }
@@ -84,7 +86,7 @@ namespace BetterSongSearch::Util {
         return SongDetailsCache::RankedStates::Unranked;
     }
 
-    float getStars(const SongDetailsCache::SongDifficulty* diff, SongDetailsCache::RankedStates state) {
+    float getStars(SongDetailsCache::SongDifficulty const* diff, SongDetailsCache::RankedStates state) {
         if (state == SongDetailsCache::RankedStates::ScoresaberRanked && diff->starsSS > 0) {
             return diff->starsSS;
         }
@@ -94,7 +96,270 @@ namespace BetterSongSearch::Util {
         return 0;
     }
 
-    float getStars(const SongDetailsCache::SongDifficulty* diff) {
+    float getStars(SongDetailsCache::SongDifficulty const* diff) {
         return getStars(diff, GetTargetedRankLeaderboardService(diff));
     }
-}
+
+    bool MeetsFilter(SongDetailsCache::Song const* song) {
+        auto& filterOptions = dataHolder.filterOptionsCache;
+        std::string songHash = song->hash();
+
+        if (filterOptions.onlyCuratedMaps) {
+            if (!hasFlags(song->uploadFlags, SongDetailsCache::UploadFlags::Curated)) {
+                return false;
+            }
+        }
+
+        if (filterOptions.onlyVerifiedMappers) {
+            if (!hasFlags(song->uploadFlags, SongDetailsCache::UploadFlags::VerifiedUploader)) {
+                return false;
+            }
+        }
+
+        if (filterOptions.onlyV3Maps) {
+            if (!hasFlags(song->uploadFlags, SongDetailsCache::UploadFlags::HasV3Environment)) {
+                return false;
+            }
+        }
+
+        if (filterOptions._mapStyleBitfield != 0 && (song->tags & filterOptions._mapStyleBitfield) == 0) {
+            return false;
+        }
+
+        if (filterOptions._mapGenreBitfield != 0 && (song->tags & filterOptions._mapGenreBitfield) == 0) {
+            return false;
+        }
+
+        if ((song->tags & filterOptions._mapGenreExcludeBitfield) != 0) {
+            return false;
+        }
+
+        if (!filterOptions.uploaders.empty()) {
+            if (std::find(filterOptions.uploaders.begin(), filterOptions.uploaders.end(), removeSpecialCharacter(toLower(song->uploaderName()))) !=
+                filterOptions.uploaders.end()) {
+                if (filterOptions.uploadersBlackList) {
+                    return false;
+                }
+            } else if (!filterOptions.uploadersBlackList) {
+                return false;
+            }
+        }
+
+        if (song->uploadTimeUnix < filterOptions.minUploadDate) {
+            return false;
+        }
+
+        float songRating = song->rating();
+        if (songRating < filterOptions.minRating) {
+            return false;
+        }
+
+        if (((int) song->upvotes + (int) song->downvotes) < filterOptions.minVotes) {
+            return false;
+        }
+
+        // Skip if not needed
+        auto localScoreType = static_cast<FilterTypes::LocalScoreFilter>(filterOptions.localScoreType);
+        if (localScoreType != FilterTypes::LocalScoreFilter::All) {
+            bool hasLocalScore = false;
+            if (dataHolder.SongHasScore(songHash)) {
+                hasLocalScore = true;
+            }
+            if (hasLocalScore) {
+                if (localScoreType == FilterTypes::LocalScoreFilter::HidePassed) {
+                    return false;
+                }
+            } else {
+                if (localScoreType == FilterTypes::LocalScoreFilter::OnlyPassed) {
+                    return false;
+                }
+            }
+        }
+
+        if (static_cast<FilterTypes::RankedFilter>(filterOptions.rankedType) != FilterTypes::RankedFilter::ShowAll) {
+            // if not the ranked that we want, skip
+            if (!hasFlags(song->rankedStates, RANK_MAP.at(static_cast<FilterTypes::RankedFilter>(filterOptions.rankedType)))) {
+                return false;
+            }
+        }
+
+        bool passesDiffFilter = true;
+
+        for (auto const& diff : *song) {
+            if (DifficultyCheck(&diff, song)) {
+                passesDiffFilter = true;
+                break;
+            } else {
+                passesDiffFilter = false;
+            }
+        }
+
+        if (!passesDiffFilter) {
+            return false;
+        }
+
+        if (song->songDurationSeconds < filterOptions.minLength) {
+            return false;
+        }
+        if (song->songDurationSeconds > filterOptions.maxLength) {
+            return false;
+        }
+
+        // This is the most heavy filter, check it last
+        if (static_cast<FilterTypes::DownloadFilter>(filterOptions.downloadType) != FilterTypes::DownloadFilter::All) {
+            bool downloaded = SongCore::API::Loading::GetLevelByHash(songHash) != nullptr;
+            if (downloaded) {
+                if (static_cast<FilterTypes::DownloadFilter>(filterOptions.downloadType) == FilterTypes::DownloadFilter::HideDownloaded) {
+                    return false;
+                }
+            } else {
+                if (static_cast<FilterTypes::DownloadFilter>(filterOptions.downloadType) == FilterTypes::DownloadFilter::OnlyDownloaded) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool DifficultyCheck(SongDetailsCache::SongDifficulty const* diff, SongDetailsCache::Song const* song) {
+        auto const& currentFilter = dataHolder.filterOptionsCache;
+
+        // if all filters are default, skip
+        if (currentFilter.isDefaultPreprocessed) {
+            return true;
+        }
+
+        if (static_cast<FilterTypes::RankedFilter>(currentFilter.rankedType) != FilterTypes::RankedFilter::ShowAll) {
+            // if not the ranked that we want, skip
+            if (!hasFlags(song->rankedStates, RANK_MAP.at(static_cast<FilterTypes::RankedFilter>(currentFilter.rankedType)))) {
+                return false;
+            }
+        }
+
+        // Min and max stars
+        if (currentFilter.maxStars != STAR_FILTER_MAX) {
+            if (getStars(diff) > currentFilter.maxStars) {
+                return false;
+            }
+        }
+        if (currentFilter.minStars > 0) {
+            if (getStars(diff) < currentFilter.minStars) {
+                return false;
+            }
+        }
+
+        if (static_cast<FilterTypes::DifficultyFilter>(currentFilter.difficultyFilter) != FilterTypes::DifficultyFilter::All) {
+            if (diff->difficulty != currentFilter.difficultyFilterPreprocessed) {
+                return false;
+            }
+        }
+
+        if (static_cast<FilterTypes::CharFilter>(currentFilter.charFilter) != FilterTypes::CharFilter::All) {
+            if (diff->characteristic != currentFilter.charFilterPreprocessed) {
+                return false;
+            }
+        }
+
+        if (diff->njs < currentFilter.minNJS || diff->njs > currentFilter.maxNJS) {
+            return false;
+        }
+
+        if (static_cast<FilterTypes::Requirement>(currentFilter.modRequirement) != FilterTypes::Requirement::Any) {
+            switch (static_cast<FilterTypes::Requirement>(currentFilter.modRequirement)) {
+                case FilterTypes::Requirement::Chroma:
+                    if (!hasFlags(diff->mods, MapMods::Chroma)) {
+                        return false;
+                    }
+                    break;
+                case FilterTypes::Requirement::Cinema:
+                    if (!hasFlags(diff->mods, MapMods::Cinema)) {
+                        return false;
+                    }
+                    break;
+                case FilterTypes::Requirement::MappingExtensions:
+                    if (!hasFlags(diff->mods, MapMods::MappingExtensions)) {
+                        return false;
+                    }
+                    break;
+                case FilterTypes::Requirement::NoodleExtensions:
+                    if (!hasFlags(diff->mods, MapMods::NoodleExtensions)) {
+                        return false;
+                    }
+                    break;
+                case FilterTypes::Requirement::None:
+                    if (!((diff->mods & (MapMods::NE | MapMods::ME)) == MapMods::None)) {
+                        return false;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (song->songDurationSeconds > 0) {
+            float nps = (float) diff->notes / (float) song->songDurationSeconds;
+
+            if (nps < currentFilter.minNPS || nps > currentFilter.maxNPS) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    using SortFunction = std::function<float(SongDetailsCache::Song const*)>;
+    std::unordered_map<FilterTypes::SortMode, SortFunction> sortFunctionMap = {
+        {FilterTypes::SortMode::Newest,
+         [](SongDetailsCache::Song const* x)  // Newest
+         {
+             return (x->uploadTimeUnix);
+         }},
+        {FilterTypes::SortMode::Oldest,
+         [](SongDetailsCache::Song const* x)  // Oldest
+         {
+             return (std::numeric_limits<uint32_t>::max() - x->uploadTimeUnix);
+         }},
+        {FilterTypes::SortMode::Latest_Ranked,
+         [](SongDetailsCache::Song const* x)  // Latest Ranked
+         {
+             return (hasFlags(x->rankedStates, (SongDetailsCache::RankedStates::BeatleaderRanked | SongDetailsCache::RankedStates::ScoresaberRanked)))
+                      ? x->rankedChangeUnix
+                      : 0.0f;
+         }},
+        {FilterTypes::SortMode::Most_Stars,
+         [](SongDetailsCache::Song const* x)  // Most Stars
+         {
+             return x->max([x](auto const& diff) {
+                 bool passesFilter = DifficultyCheck(&diff, x);
+                 if (passesFilter && (getStars(&diff) > 0)) {
+                     return getStars(&diff);
+                 } else {
+                     return 0.0f;
+                 }
+             });
+         }},
+        {FilterTypes::SortMode::Least_Stars,
+         [](SongDetailsCache::Song const* x)  // Least Stars
+         {
+             return 420.0f - x->min([x](auto const& diff) {
+                 bool passesFilter = DifficultyCheck(&diff, x);
+                 if (passesFilter && (getStars(&diff) > 0)) {
+                     return getStars(&diff);
+                 } else {
+                     return 420.0f;
+                 }
+             });
+         }},
+        {FilterTypes::SortMode::Best_rated,
+         [](SongDetailsCache::Song const* x)  // Best rated
+         {
+             return x->rating();
+         }},
+        {FilterTypes::SortMode::Worst_rated,
+         [](SongDetailsCache::Song const* x)  // Worst rated
+         {
+             return 420.0f - (x->rating() != 0 ? x->rating() : 420.0f);
+         }}
+    };
+}  // namespace BetterSongSearch::Util
diff --git a/src/Util/TextUtil.cpp b/src/Util/TextUtil.cpp
index b332503..4875585 100644
--- a/src/Util/TextUtil.cpp
+++ b/src/Util/TextUtil.cpp
@@ -1,37 +1,53 @@
 #include "Util/TextUtil.hpp"
 
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <cctype> 
 #include <fmt/format.h>
-namespace BetterSongSearch::Util { 
+
+#include <algorithm>
+#include <cctype>
+#include <string>
+#include <vector>
+
+namespace BetterSongSearch::Util {
     // this hurts
-    std::vector<std::string> split(std::string_view buffer, const std::string_view delimeter) {
+    std::vector<std::string> split(std::string_view buffer, std::string_view const delimeter) {
         std::vector<std::string> ret{};
         std::decay_t<decltype(std::string::npos)> pos{};
         while ((pos = buffer.find(delimeter)) != std::string::npos) {
-            const auto match = buffer.substr(0, pos);
-            if (!match.empty()) ret.emplace_back(match);
+            auto const match = buffer.substr(0, pos);
+            if (!match.empty()) {
+                ret.emplace_back(match);
+            }
             buffer = buffer.substr(pos + delimeter.size());
         }
-        if (!buffer.empty()) ret.emplace_back(buffer);
+        if (!buffer.empty()) {
+            ret.emplace_back(buffer);
+        }
+        return ret;
+    }
+
+    std::string join(std::vector<std::string> strings, std::string_view const delimeter) {
+        if (strings.empty()) {
+            return "";
+        }
+
+        std::string ret;
+        for (size_t i = 0; i < strings.size(); i++) {
+            ret += strings[i];
+            if (i != strings.size() - 1) {
+                ret += delimeter;
+            }
+        }
         return ret;
     }
 
     /**
      * Removes special characters from a string
-    */
+     */
     std::string removeSpecialCharacter(std::string_view const s) {
         std::string stringy(s);
         for (int i = 0; i < stringy.size(); i++) {
-
-            if (
-                stringy[i] != ' ' && 
-                (stringy[i] < 'A' || stringy[i] > 'Z') &&
-                (stringy[i] < 'a' || stringy[i] > 'z') &&
-                (stringy[i] < '0' || stringy[i] > '9')
-            ) {
+            if (stringy[i] != ' ' && (stringy[i] < 'A' || stringy[i] > 'Z') && (stringy[i] < 'a' || stringy[i] > 'z') &&
+                (stringy[i] < '0' || stringy[i] > '9')) {
                 stringy.erase(i, 1);
                 i--;
             }
@@ -52,41 +68,39 @@ namespace BetterSongSearch::Util {
         return toLower(std::string(s));
     }
 
-    bool IsSpace(char x) { return x == ' ' || !isalnum(x); };
+    bool IsSpace(char x) {
+        return x == ' ' || !isalnum(x);
+    };
 
-    std::string httpErrorToString(int code)
-    {
-        switch (code)
-        {
-        case 400:
-            return "Bad Request";
-        case 401:
-            return "Unauthorized";
-        case 403:
-            return "Forbidden";
-        case 404:
-            return "Not Found";
-        case 405:
-            return "Method Not Allowed";
-        case 429:
-            return "Too Many Requests";
-        case 500:
-            return "Internal Server Error";
-        case 502:
-            return "Bad Gateway";
-        case 503:
-            return "Service Unavailable";
-        case 504:
-            return "Gateway Timeout";
-        default:
-            return fmt::format("HTTP Error {}", code);
+    std::string httpErrorToString(int code) {
+        switch (code) {
+            case 400:
+                return "Bad Request";
+            case 401:
+                return "Unauthorized";
+            case 403:
+                return "Forbidden";
+            case 404:
+                return "Not Found";
+            case 405:
+                return "Method Not Allowed";
+            case 429:
+                return "Too Many Requests";
+            case 500:
+                return "Internal Server Error";
+            case 502:
+                return "Bad Gateway";
+            case 503:
+                return "Service Unavailable";
+            case 504:
+                return "Gateway Timeout";
+            default:
+                return fmt::format("HTTP Error {}", code);
         }
     }
 
-    std::string curlErrorToString(int code)
-    {
-        switch (code)
-        {
+    std::string curlErrorToString(int code) {
+        switch (code) {
             case 0:  // CURLE_OK
                 return "No error";
             case 1:  // CURLE_UNSUPPORTED_PROTOCOL
@@ -99,19 +113,19 @@ namespace BetterSongSearch::Util {
                 return "Couldn't resolve host";
             case 7:  // CURLE_COULDNT_CONNECT
                 return "Couldn't connect to server";
-            case 16: // CURLE_HTTP2
+            case 16:  // CURLE_HTTP2
                 return "HTTP/2 framing layer error";
-            case 28: // CURLE_OPERATION_TIMEDOUT
+            case 28:  // CURLE_OPERATION_TIMEDOUT
                 return "Operation timed out";
-            case 35: // CURLE_SSL_CONNECT_ERROR
+            case 35:  // CURLE_SSL_CONNECT_ERROR
                 return "SSL connection error";
-            case 52: // CURLE_GOT_NOTHING
+            case 52:  // CURLE_GOT_NOTHING
                 return "Server returned nothing";
-            case 78: // CURLE_REMOTE_FILE_NOT_FOUND
+            case 78:  // CURLE_REMOTE_FILE_NOT_FOUND
                 return "Remote file not found";
 
             default:
                 return fmt::format("Code {}", code);
         }
     }
-}
+}  // namespace BetterSongSearch::Util
diff --git a/src/main.cpp b/src/main.cpp
index 42a99dc..2309b9a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,37 +1,38 @@
 #include "main.hpp"
+
 #include "_config.h"
-#include "System/Action.hpp"
+#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
+#include "bsml/shared/Helpers/delegates.hpp"
+#include "bsml/shared/Helpers/getters.hpp"
 #include "custom-types/shared/register.hpp"
-#include "GlobalNamespace/PlayerDataModel.hpp"
-#include "GlobalNamespace/PlayerData.hpp"
-#include "UnityEngine/GameObject.hpp"
-#include "UnityEngine/Resources.hpp"
+#include "DataHolder.hpp"
 #include "GlobalNamespace/BeatmapKey.hpp"
+#include "GlobalNamespace/BeatmapLevelPack.hpp"
 #include "GlobalNamespace/GameplaySetupViewController.hpp"
 #include "GlobalNamespace/LevelFilteringNavigationController.hpp"
-#include "GlobalNamespace/BeatmapLevelPack.hpp"
-#include "GlobalNamespace/SongPackMask.hpp"
-#include "GlobalNamespace/SelectLevelCategoryViewController.hpp"
+#include "GlobalNamespace/MainFlowCoordinator.hpp"
+#include "GlobalNamespace/MenuTransitionsHelper.hpp"
 #include "GlobalNamespace/MultiplayerLevelScenesTransitionSetupDataSO.hpp"
 #include "GlobalNamespace/MultiplayerResultsViewController.hpp"
-#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
-#include "UI/ViewControllers/SongList.hpp"
+#include "GlobalNamespace/PlayerData.hpp"
+#include "GlobalNamespace/SelectLevelCategoryViewController.hpp"
+#include "GlobalNamespace/SongPackMask.hpp"
+#include "HMUI/TextSegmentedControlCell.hpp"
+#include "logging.hpp"
 #include "PluginConfig.hpp"
+#include "System/Action.hpp"
+#include "UI/FlowCoordinators/BetterSongSearchFlowCoordinator.hpp"
 #include "UI/Manager.hpp"
-#include "HMUI/TextSegmentedControlCell.hpp"
-#include "bsml/shared/Helpers/delegates.hpp"
+#include "UI/ViewControllers/SongList.hpp"
+#include "UnityEngine/GameObject.hpp"
+#include "UnityEngine/Resources.hpp"
 #include "Util/TextUtil.hpp"
-#include "logging.hpp"
-#include "GlobalNamespace/MainFlowCoordinator.hpp"
-#include "bsml/shared/BSML/SharedCoroutineStarter.hpp"
-#include "bsml/shared/Helpers/getters.hpp"
 
 #define coro(coroutine) BSML::SharedCoroutineStarter::get_instance()->StartCoroutine(custom_types::Helpers::CoroutineHelper::New(coroutine))
 
 using namespace BetterSongSearch::Util;
-
-inline modloader::ModInfo modInfo = {MOD_ID, VERSION, GIT_COMMIT}; // Stores the ID and version of our mod, and is sent to the modloader upon startup
-
+using namespace BetterSongSearch;
+using namespace BetterSongSearch::UI;
 
 // Called at the early stages of game loading
 BSS_EXPORT_FUNC void setup(CModInfo& info) {
@@ -40,72 +41,47 @@ BSS_EXPORT_FUNC void setup(CModInfo& info) {
     modInfo.assign(info);
 
     getPluginConfig().Init(modInfo);
+
     INFO("Completed setup!");
 
-    std::thread([]{
-        auto& filterOptions = DataHolder::filterOptions;
-        INFO("setting config values");
-        filterOptions.downloadType = (FilterOptions::DownloadFilterType) getPluginConfig().DownloadType.GetValue();
-        filterOptions.localScoreType = (FilterOptions::LocalScoreFilterType) getPluginConfig().LocalScoreType.GetValue();
-        filterOptions.minLength = getPluginConfig().MinLength.GetValue();
-        filterOptions.maxLength = getPluginConfig().MaxLength.GetValue();
-        filterOptions.minNJS = getPluginConfig().MinNJS.GetValue();
-        filterOptions.maxNJS = getPluginConfig().MaxNJS.GetValue();
-        filterOptions.minNPS = getPluginConfig().MinNPS.GetValue();
-        filterOptions.maxNPS = getPluginConfig().MaxNPS.GetValue();
-        filterOptions.rankedType = (FilterOptions::RankedFilterType) getPluginConfig().RankedType.GetValue();
-        filterOptions.minStars = getPluginConfig().MinStars.GetValue();
-        filterOptions.maxStars = getPluginConfig().MaxStars.GetValue();
-        filterOptions.minUploadDate = getPluginConfig().MinUploadDate.GetValue();
-        filterOptions.minRating = getPluginConfig().MinRating.GetValue();
-        filterOptions.minVotes = getPluginConfig().MinVotes.GetValue();
-        filterOptions.charFilter = (FilterOptions::CharFilterType) getPluginConfig().CharacteristicType.GetValue();
-        filterOptions.difficultyFilter = (FilterOptions::DifficultyFilterType) getPluginConfig().DifficultyType.GetValue();
-        filterOptions.modRequirement = (FilterOptions::RequirementType) getPluginConfig().RequirementType.GetValue();
-        filterOptions.minUploadDateInMonths = getPluginConfig().MinUploadDateInMonths.GetValue();
-        
-        // Preferred Leaderboard
-        std::string preferredLeaderboard = getPluginConfig().PreferredLeaderboard.GetValue();
-        if (leaderBoardMap.contains(preferredLeaderboard)) {
-            DataHolder::preferredLeaderboard = leaderBoardMap.at(preferredLeaderboard);
-        } else {
-            DataHolder::preferredLeaderboard = PreferredLeaderBoard::ScoreSaber;
-            getPluginConfig().PreferredLeaderboard.SetValue("Scoresaber");
-        }
-        
-        // Custom string loader
-        auto uploadersString = getPluginConfig().Uploaders.GetValue();
-        if (!uploadersString.empty()) {
-            if (uploadersString[0] == '!') {
-                uploadersString.erase(0,1);
-                filterOptions.uploadersBlackList = true;
-            } else {
-                filterOptions.uploadersBlackList = false;
-            }
-            filterOptions.uploaders = split(toLower(uploadersString), " ");
-        } else {
-            filterOptions.uploaders.clear();
-        }
-    }).detach();   
+    std::thread([] {
+        // Init the data holder (sub to events)
+        dataHolder.Init();
+    }).detach();
 }
 
-MAKE_HOOK_MATCH(MainFlowCoordinator_DidActivate, &GlobalNamespace::MainFlowCoordinator::DidActivate, void, GlobalNamespace::MainFlowCoordinator* self, bool firstActivation, bool addedToHierarchy, bool screenSystemEnabling) {
+MAKE_HOOK_MATCH(
+    MainFlowCoordinator_DidActivate,
+    &GlobalNamespace::MainFlowCoordinator::DidActivate,
+    void,
+    GlobalNamespace::MainFlowCoordinator* self,
+    bool firstActivation,
+    bool addedToHierarchy,
+    bool screenSystemEnabling
+) {
     MainFlowCoordinator_DidActivate(self, firstActivation, addedToHierarchy, screenSystemEnabling);
-    static bool debugstarted = false; 
+    static bool debugstarted = false;
     if (!debugstarted) {
         debugstarted = true;
-        self->StartCoroutine(custom_types::Helpers::new_coro(
-            manager.Debug()
-        ));
+        self->StartCoroutine(custom_types::Helpers::new_coro(manager.Debug()));
     }
 }
 
-MAKE_HOOK_MATCH(ReturnToBSS, &HMUI::FlowCoordinator::DismissFlowCoordinator, void, HMUI::FlowCoordinator* self, HMUI::FlowCoordinator* flowCoordinator, HMUI::ViewController::AnimationDirection animationDirection, System::Action* finishedCallback, bool immediately) {
-    if(!getPluginConfig().ReturnToBSS.GetValue()) {
+MAKE_HOOK_MATCH(
+    ReturnToBSS,
+    &HMUI::FlowCoordinator::DismissFlowCoordinator,
+    void,
+    HMUI::FlowCoordinator* self,
+    HMUI::FlowCoordinator* flowCoordinator,
+    HMUI::ViewController::AnimationDirection animationDirection,
+    System::Action* finishedCallback,
+    bool immediately
+) {
+    if (!getPluginConfig().ReturnToBSS.GetValue()) {
         ReturnToBSS(self, flowCoordinator, animationDirection, finishedCallback, immediately);
         return;
     }
-    if(!(flowCoordinator->get_gameObject()->get_name() == "SoloFreePlayFlowCoordinator")) {
+    if (!(flowCoordinator->get_gameObject()->get_name() == "SoloFreePlayFlowCoordinator")) {
         ReturnToBSS(self, flowCoordinator, animationDirection, finishedCallback, immediately);
         return;
     }
@@ -113,15 +89,37 @@ MAKE_HOOK_MATCH(ReturnToBSS, &HMUI::FlowCoordinator::DismissFlowCoordinator, voi
     ReturnToBSS(self, flowCoordinator, animationDirection, finishedCallback, true);
     if (fromBSS) {
         auto currentFlowCoordinator = BSML::Helpers::GetMainFlowCoordinator()->YoungestChildFlowCoordinatorOrSelf();
-        UnityW<BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator> betterSongSearchFlowCoordinator = UnityEngine::Resources::FindObjectsOfTypeAll<BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator*>()->FirstOrDefault();
-        if(betterSongSearchFlowCoordinator)
-            currentFlowCoordinator->PresentFlowCoordinator(betterSongSearchFlowCoordinator, nullptr, HMUI::ViewController::AnimationDirection::Horizontal, true, false);
+        UnityW<BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator> betterSongSearchFlowCoordinator =
+            UnityEngine::Resources::FindObjectsOfTypeAll<BetterSongSearch::UI::FlowCoordinators::BetterSongSearchFlowCoordinator*>()->FirstOrDefault(
+            );
+        if (betterSongSearchFlowCoordinator) {
+            currentFlowCoordinator->PresentFlowCoordinator(
+                betterSongSearchFlowCoordinator, nullptr, HMUI::ViewController::AnimationDirection::Horizontal, true, false
+            );
+        }
     }
-    
 };
 
-MAKE_HOOK_MATCH(GameplaySetupViewController_RefreshContent, &GlobalNamespace::GameplaySetupViewController::RefreshContent, void, GlobalNamespace::GameplaySetupViewController* self)
-{
+// Soft restart in settings
+MAKE_HOOK_MATCH(
+    MenuTransitionsHelper_RestartGame,
+    &GlobalNamespace::MenuTransitionsHelper::RestartGame,
+    void,
+    GlobalNamespace::MenuTransitionsHelper* self,
+    System::Action_1<Zenject::DiContainer*>* finishCallback
+) {
+    DEBUG("Destroying manager flow before restart");
+    manager.DestroyFlow();
+    fromBSS = false;
+    MenuTransitionsHelper_RestartGame(self, finishCallback);
+}
+
+MAKE_HOOK_MATCH(
+    GameplaySetupViewController_RefreshContent,
+    &GlobalNamespace::GameplaySetupViewController::RefreshContent,
+    void,
+    GlobalNamespace::GameplaySetupViewController* self
+) {
     GameplaySetupViewController_RefreshContent(self);
 
     bool multiplayer = self->____showMultiplayer;
@@ -136,37 +134,42 @@ MAKE_HOOK_MATCH(GameplaySetupViewController_RefreshContent, &GlobalNamespace::Ga
         }
         return;
     }
-    
 
-    if(!button) {
+    if (!button) {
         DEBUG("Button not found, creating");
-        auto x = self->get_transform()->Find("BSMLBackground/BSMLTabSelector");
-        if (x==nullptr) {
+        UnityW<UnityEngine::Transform> x = self->get_transform()->Find("BSMLBackground/BSMLTabSelector");
+        if (!x) {
             x = self->get_transform()->Find("TextSegmentedControl");
         }
-        if (x == nullptr) {
+        if (!x) {
             return;
         }
 
-        button = UnityEngine::GameObject::Instantiate(x->get_transform()->GetChild(x->get_transform()->GetChildCount()-1), x)->get_gameObject();
+        button = UnityEngine::GameObject::Instantiate(x->get_transform()->GetChild(x->get_transform()->GetChildCount() - 1), x)->get_gameObject();
+        if (!button) {
+            ERROR("Could not create button somehow");
+            return;
+        }
 
-        auto t = button->GetComponent<HMUI::TextSegmentedControlCell*>();
+        UnityW<HMUI::TextSegmentedControlCell> t = button->GetComponent<HMUI::TextSegmentedControlCell*>();
 
         t->set_text("Better Song Search");
 
-        reinterpret_cast<HMUI::SelectableCell*>(t)->____wasPressedSignal=nullptr;
-
-        
-        std::function<void(UnityW<::HMUI::SelectableCell>, HMUI::SelectableCell::TransitionType, ::System::Object*)> fun = [t](UnityW<::HMUI::SelectableCell> cell, HMUI::SelectableCell::TransitionType transition, ::System::Object* obj) {
-            if(!t->get_selected())
-                return;
+        t.cast<HMUI::SelectableCell>()->____wasPressedSignal = nullptr;
 
-            t->set_selected(false);
-            manager.ShowFlow(false);
-         };
+        std::function<void(UnityW<::HMUI::SelectableCell>, HMUI::SelectableCell::TransitionType, ::System::Object*)> fun =
+            [](UnityW<::HMUI::SelectableCell> cell, HMUI::SelectableCell::TransitionType transition, ::System::Object* obj) {
+                if (!cell) {
+                    return;
+                }
+                if (!cell->get_selected()) {
+                    return;
+                }
 
+                cell->set_selected(false);
+                manager.ShowFlow(false);
+            };
         auto action = BSML::MakeSystemAction(fun);
-
         t->add_selectionDidChangeEvent(action);
     }
 
@@ -174,24 +177,25 @@ MAKE_HOOK_MATCH(GameplaySetupViewController_RefreshContent, &GlobalNamespace::Ga
 }
 
 MAKE_HOOK_MATCH(
-    LevelFilteringNavigationController_Setup, 
-    &GlobalNamespace::LevelFilteringNavigationController::Setup, 
-    void, 
-    GlobalNamespace::LevelFilteringNavigationController* self, 
+    LevelFilteringNavigationController_Setup,
+    &GlobalNamespace::LevelFilteringNavigationController::Setup,
+    void,
+    GlobalNamespace::LevelFilteringNavigationController* self,
     GlobalNamespace::SongPackMask songPackMask,
     GlobalNamespace::BeatmapLevelPack* levelPackToBeSelectedAfterPresent,
     GlobalNamespace::__SelectLevelCategoryViewController__LevelCategory startLevelCategory,
     bool hidePacksIfOneOrNone,
     bool enableCustomLevels
-)
-{
-	LevelFilteringNavigationController_Setup(self, songPackMask, levelPackToBeSelectedAfterPresent, startLevelCategory, hidePacksIfOneOrNone, enableCustomLevels);
+) {
+    LevelFilteringNavigationController_Setup(
+        self, songPackMask, levelPackToBeSelectedAfterPresent, startLevelCategory, hidePacksIfOneOrNone, enableCustomLevels
+    );
 
     // To have interoperability with pinkcore I trigger it only if pressing play in the bss
-	if (openToCustom ) {
-		self->____selectLevelCategoryViewController->Setup(startLevelCategory.CustomSongs, self->____enabledLevelCategories);
+    if (openToCustom) {
+        self->____selectLevelCategoryViewController->Setup(startLevelCategory.CustomSongs, self->____enabledLevelCategories);
         openToCustom = false;
-	}
+    }
 }
 
 MAKE_HOOK_MATCH(
@@ -215,22 +219,22 @@ MAKE_HOOK_MATCH(
     // Close manager first
     manager.Close(true, false);
     MultiplayerLevelScenesTransitionSetupDataSO_Init(
-            self,
-            gameMode,
-            beatmapKey,
-            beatmapLevel,
-            beatmapLevelData,
-            overrideColorScheme,
-            gameplayModifiers,
-            playerSpecificSettings,
-            practiceSettings,
-            audioClipAsyncLoader,
-            performancePreset,
-            beatmapDataLoader,
-            useTestNoteCutSoundEffects
-            );
+        self,
+        gameMode,
+        beatmapKey,
+        beatmapLevel,
+        beatmapLevelData,
+        overrideColorScheme,
+        gameplayModifiers,
+        playerSpecificSettings,
+        practiceSettings,
+        audioClipAsyncLoader,
+        performancePreset,
+        beatmapDataLoader,
+        useTestNoteCutSoundEffects
+    );
 }
-	
+
 // Called later on in the game loading - a good time to install function hooks
 BSS_EXPORT_FUNC void late_load() {
     il2cpp_functions::Init();
@@ -241,9 +245,10 @@ BSS_EXPORT_FUNC void late_load() {
     INSTALL_HOOK(Logger, GameplaySetupViewController_RefreshContent);
     INSTALL_HOOK(Logger, LevelFilteringNavigationController_Setup);
     INSTALL_HOOK(Logger, MultiplayerLevelScenesTransitionSetupDataSO_Init);
+    INSTALL_HOOK(Logger, MenuTransitionsHelper_RestartGame);
 
     // Automatic testing
     // INSTALL_HOOK(Logger, MainFlowCoordinator_DidActivate);
 
     manager.Init();
-}
\ No newline at end of file
+}
diff --git a/watch-templates.js b/watch-templates.js
new file mode 100644
index 0000000..005aab2
--- /dev/null
+++ b/watch-templates.js
@@ -0,0 +1,37 @@
+
+
+var chokidar = require('chokidar');
+var exec = require('child_process').exec;
+var fs = require('fs');
+var path = require('path');
+
+var watcher = chokidar.watch('assets', {
+    ignored: /[\/\\]\./,
+    persistent: true
+    });
+
+watcher
+    .on('add', function(path) {
+        console.log('File', path, 'has been added');
+        pushFile(path);
+    })
+    .on('change', function(path) {
+        console.log('File', path, 'has been changed');
+        pushFile(path);
+    })
+    .on('unlink', function(path) {
+        console.log('File', path, 'has been removed');
+    });
+
+function pushFile(file) {
+    var filename = path.basename(file);
+    var destination = '/sdcard/bsml/BetterSongSearch/' + filename;
+    exec('adb push ' + file + ' ' + destination, function(error, stdout, stderr) {
+        if (error) {
+            console.log('Error pushing file: ' + error);
+        }
+        else {
+            console.log('Pushed ' + file + ' to ' + destination);
+        }
+    });
+}
\ No newline at end of file