Feature/scud controller