Feature/bmackall/added spinner functionality