Fix Todo: Figure out a new name for "cls"