Derp fix stabalize
Refactor expand for more flexible composability