Work on composers

Signed-off-by: Gavin Gassmann <gassmann.gavin@gmail.com>