Separating hotspot concerns

PR for maintainers to play with separating out hotspot concerns