Adding the modules I want
Some stuffs todo