Manually merge branch 'outline'
Rewrite Makefile to use a batch file instead.