another checkin - added composite pattern (need additional comments)
started adding decorator pattern