More work on slides and moving demos around