last commit before the talk tomorrow, code samples in place