Really finished investigation system, also rearranged code structure