Adding first pass of build options