some more things in storm, not finished