Added final modules; began makefile