More slides, refactor...