Added argument for step calculation
Implemented "steps"

Toroid is seg faulting however. Will perform a binary search since the
feature was introduced (I think there are only a few patches, shouldn't
be too hard)