Final try on making it work with composer today.