More tweaking to get this thing installable via composer...