Desktop version

Desktop version done