Almost get all modules working