Working towards CHW desktop release