Investigation endpoint needs refactoring

The investigaiton endpoint needs a huge refactoring.