Remove unneeded classes
More work on the tornado mechanicss
Add an empty Wind class