Wrote a makefile, and moved some stuff into a header file