[BUG] Crashes on launch
Attempt to refactor