Initial Switch to CodeBuddy