refactored with composite components and now i am working on groups