the storm is coming, refactoring on the way