working on desktop
getting everything merged