starting slash and burn refactoring / namespacing