Moved some stuff out of the graphics thread that didn't need to be there