First implementation of the tray
Merge branch 'tray'