Finished the desktop version