upgrading savi to havana, work in progress