cleanup
Merge branch 'set_events' into active_card