Desks 1 implementation

Raw commit with intermediary files before merge and fixing