[WIP] Adding embedded composer