Methods modularized, ready for big change