I think I caught all edges of refactor. Time to get this to run