Kdrefactor

Um, this is outdated