boss dot refactoring.. more to come