Worked a bit more on desktop