Feature/shell