added a spinner and more testing