[WIP] Composite-based redesign