Updated ToDos
Updated name and Makefile accordingly