Mega-Refactor part II