Building out Makefile and fixing things... but things are still broken.