Spinny sticks testing

Branch is getting stale, so it needs to be merged into master