Add spinners. Fixes #17