Refactoring to using switches and cases to implement decision points. Currently using default path.