Mark %SCSI and %SES as todo items
Add Tree collector