Moved everything to seperatefiles, ramped up the makefile, redesigning everything to incorporate totally variable input.