Initial work for an improved compositor