Made a few more tweeks to get all modules working so far