Started conversion to pyAirviro 2.2