[WIP] Updated the Interrogator stuff