REFACTOR: More MakeMe conversion