Almost all done for Module 2