Move to requiring storm to run