Feature/tornado

Pending review