Trying to move logic to wraith_manager