Issue #41 Adding initial classes to support reports