More organization with callbacks and enumeration style experiments