Session 4

Various changes, including multiple inclusion guards and static members