in-progress #4 - modify build scripts