first major refactor and new boss