switching to desktop...
progress on #11 and #12 which should probably be in friends-of-friends