merge in some drm files to be built in