roughing out the makefile
reconsiling changes