refactor, prep for breakdowns