Add makefile, and Collector stuff