First steps in redesign of create event
Refactored to module pattern - aaah so much better