Initial code changes to support fubarino.