Moving option checking to core function
Better tracking the walk through process.