Moved step into its own module