new untested spindle code