Feature/embedded console