restructuring
cleaning up
adding mezzanine events