Post weekend convoluted commit

Will fix on desktop