Refactoring to use new calypso version. Making setup explicit.