Thing Refactor/Shadow757