mostly finished most of the modules