Implement Lightning
Fix the order of event card definitions
Merge branch 'implement-lightning'