Adding in trajectory things
control-daemon updated for comp mode