Added a bunch of new modules