Added makefile
Added todo comments