Edit for compilability and set EventListener usable
Stage all for commit