Added makefile and remove last of neighbours stuff