major composability overhaul
lint fix