First rough implementation of new, much more scalable detection mechanism