Merged spins branch
Not sure I'm doing this correctly...