Added a Lifecycle participant so we can control
the ordering.
Rubbish
Cleanup