Add some better handling for shell errors
redo build process