better stab at nesting components