Finished modularity project 1