massive breakout refactor