Thing Refactor/Leojsaad