major refactoring of corenova-storm plugin... will require testing and debuggin
resolve merge conflict