Refactoring

Let's try to get this merged....