complete overhaul. Not crashing anymore but loading screen is still bugged