Magik Refactor/Loupi

WIP