WIP: CompositeFinder