Completed most of the modules