Aarons decorator UML additions and code additions, Javadoc additions, composition code, and author names added to remaining files