first steps towards full cff support