Finish rewriting conspect, add Makefile