Adds the detective stuff again.
Makes the code compile.
Merge pull request #760 from MrSnapwalk/snoopv2

Detective tweaks, now with 100% less merge conflicts!