Moved to software's Thread

@tmomas please move this here.