refactoring, need to explore different methods for isolating buildings