Final commit of wait spinner impl for when format changes