Composition window mostly working now