Forgot to add a couple files. Updated Makefile to be correct now