WIP: Beginning to sketch out types for abstracting build methods.
WIP: some more progress
Remove options not taken
Add a bit to the Make build method.
A bit more progress.  Also refactored CLI options