WIP AMF7 development