First problem done, plus Makefile