desktop version almost done