Add spinner to more funcitonality