Updated presentation/some logic based on talk in #500.