Added composer. Finalised base form