Lightning Talks Saturday

Refactoring