(test) and components.  More comments and notes