fat refactoring incoming