Added a bunch of modules & added usage t the older ones