Merge Session 2

Derek Cook