WIP on tornado implementation