Support initd, add testing, add some conditionnals