Miscellaneous (One-Way) Controller Logic

Still can't reverse a class removal yet (not obvious).