Ugh, less global state I GUESS