JUST A HUGE NON-FUNC UPDATE