Started modifying main.
Fixed makefile to actually generate objects.