Update from Office 2

Added new classes to work with later. Testing.