refactoring

Adding the new guy