Experimenting refactoring for Homebase