Will redo everything soon, with tests :P