Added some starting headers
Fixed makefile... again