Modularizing and some major work on the boot-loader option.