Refactors and thor!