Initial commit PART DEUX

Signed-off-by: Tobi Beernaert <fowbi.x@gmail.com>