First commit of desktop version