Spinner refactoring work in progress.