temp: move spinner to somewhere it doesn't break