#276 - Removing more stuff to do with corrected step variables
#276 - More refactoring of the cycling methods and ensuring parameters are passed correctly