Rough draft
Fix output stubs
Tweaked
Working Makefile