Wip/warry compile refactoring