Complete Matrix with Generic components

some tasks complete