Last update before refactor to Air Desktop App