rounding up the epic refactor