started switch to havana, not working yet...
okay, not setup but demo, and changes to make file to match...
well, in theory this is updated to the current version...